Index: /applications/editors/josm/i18n/po/ar.po
===================================================================
--- /applications/editors/josm/i18n/po/ar.po	(revision 23466)
+++ /applications/editors/josm/i18n/po/ar.po	(revision 23467)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-01 19:14+0200\n"
-"PO-Revision-Date: 2010-09-25 12:53+0000\n"
+"POT-Creation-Date: 2010-10-03 22:45+0200\n"
+"PO-Revision-Date: 2010-10-01 20:15+0000\n"
 "Last-Translator: Hsn <hh-shwaf@hotmail.com>\n"
 "Language-Team: Arabic <ar@li.org>\n"
@@ -17,5 +17,5 @@
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n % 100 >= "
 "3 && n % 100 <= 10 ? 3 : n % 100 >= 11 && n % 100 <= 99 ? 4 : 5;\n"
-"X-Launchpad-Export-Date: 2010-10-01 16:29+0000\n"
+"X-Launchpad-Export-Date: 2010-10-03 20:35+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -86,5 +86,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:251
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:515
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:186
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121
@@ -223,5 +223,4 @@
 
 #. Strings in JFileChooser
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
@@ -272,7 +271,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:995
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:992
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119
@@ -297,5 +296,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
-#: build/specialmessages.java:33 build/specialmessages.java:90
+#: build/specialmessages.java:33
 msgid "Cancel"
 msgstr "إلغاء"
@@ -415,5 +414,5 @@
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:42
-#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:40
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -664,5 +663,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:145
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:509
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
@@ -1538,6 +1537,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:112
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:834
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:844
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:831
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:841
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:64
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:78
@@ -1601,5 +1600,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
-#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1327
+#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1340
 #: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1406
 #: build/specialmessages.java:65
@@ -1709,5 +1708,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
-#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1300
+#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1313
 #: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1382
 msgid "Close"
@@ -1760,5 +1759,4 @@
 msgstr ""
 
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
@@ -1766,5 +1764,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:87
-#: build/specialmessages.java:88
 msgid "Yes"
 msgstr ""
@@ -2470,5 +2467,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:783
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:108
@@ -2869,41 +2866,41 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:459
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:449
 #, java-format
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:641
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:631
 #, java-format
 msgid "Unexpected token. Expected {0}, found {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:656
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:646
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:667
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:657
 msgid "Missing parameter for OR"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:692
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:682
 msgid "Missing operator for NOT"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:689
+msgid "Primitive id expected"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:691
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:694
+msgid "Range of numbers expected"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:697
+msgid "Changeset id expected"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:699
-msgid "Primitive id expected"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:701
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:704
-msgid "Range of numbers expected"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:707
-msgid "Changeset id expected"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:709
 msgid "Version expected"
 msgstr ""
@@ -2960,5 +2957,4 @@
 
 #. Strings in JFileChooser
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
@@ -2989,5 +2985,5 @@
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:686
-#: build/specialmessages.java:58 build/specialmessages.java:87
+#: build/specialmessages.java:58
 msgid "OK"
 msgstr "مُوافق"
@@ -3580,5 +3576,5 @@
 msgstr "ش."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:243
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:258
 #, java-format
 msgid ""
@@ -3586,5 +3582,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:651
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:666
 #, java-format
 msgid ""
@@ -4436,5 +4432,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
 msgid "Presets"
@@ -6378,5 +6374,5 @@
 #. item "Highways/Streets/Roundabout" text "Name"
 #. <space />
-#. <key key="bridge" value="yes" />
+#. unparsed line             <combo key="bridge" values="yes,viaduct,swing,aqueduct" required="true" default="yes" text="Bridge" />
 #. <optional>
 #. item "Highways/Streets/Bridge" text "Name"
@@ -7671,5 +7667,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:572
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:639
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:146
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:143
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
 msgid "<different>"
@@ -9082,9 +9078,7 @@
 msgstr ""
 
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
-#: build/specialmessages.java:89
 msgid "No"
 msgstr ""
@@ -11938,5 +11932,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:489
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:512
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:514
 msgid "Please select an entry."
 msgstr "الرجاء إختيار خانة."
@@ -12354,38 +12348,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:266
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:270
 msgid "Actions"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:396
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:418
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:400
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:422
 msgid "Separator"
 msgstr "الفاصل"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:580
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:584
 msgid "Toolbar"
 msgstr "شريط الأدوات"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:584
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:588
 msgid "Available"
 msgstr "المتوفّر"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:623
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:627
 msgid "Action parameters"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:624
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:628
 msgid "Parameter name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:625
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:629
 msgid "Parameter value"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:630
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:634
 msgid "Toolbar customization"
 msgstr "تخصيص إعتيادات شريط الأدوات"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:631
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:635
 msgid "Customize the elements on the toolbar."
 msgstr "تخصيص إعتيادات العناصر على شريط الأدوات"
@@ -12691,5 +12685,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:384
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:381
 #, java-format
 msgid ""
@@ -12698,49 +12692,49 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:514
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:511
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:314
 msgid "More information about this feature"
 msgstr "مزيد من المعلومات عن هذه الميزة"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:551
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:548
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:605
+msgid "Available roles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:606
+msgid "role"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607
+msgid "count"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:608
-msgid "Available roles"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:609
-msgid "role"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:610
-msgid "count"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:611
 msgid "elements"
 msgstr ""
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:626
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:623
 msgid "Optional Attributes:"
 msgstr "ميزات خيارية:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:724
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:721
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "نوع غير معروف: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:792
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:789
 msgid "Preset role element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:800
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:797
 msgid "Preset sub element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:833
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:830
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -12750,15 +12744,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:843
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:840
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "خطأ في التحليل النحوي  {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:884
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:881
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "العناصر من الفصيلة {0} هي مدعومة"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:980
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:977
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -12772,22 +12766,22 @@
 msgstr[5] "غيّر {0} غرض"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:983
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:980
 msgid "Nothing selected!"
 msgstr "الخيار فارغ !"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:985
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:982
 msgid "Selection unsuitable!"
 msgstr "الخيار غير مناسب !"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:995
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:992
 msgid "Apply Preset"
 msgstr "طبّق الخيار المسبق"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
 msgid "New relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1083
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1080
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -12816,9 +12810,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:273
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:278
 msgid "Show only applicable to selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:295
 msgid "Search in tags"
 msgstr ""
@@ -17939,4 +17933,15 @@
 msgstr ""
 
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:40
+#, fuzzy
+msgid "Seamap Editor"
+msgstr "الفاصل"
+
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#, fuzzy
+msgid "Seanap Editor"
+msgstr "الفاصل"
+
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:38
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
@@ -19914,5 +19919,5 @@
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:90
 #, java-format
 msgid "{0} {1}% of GPS track"
@@ -20202,6 +20207,7 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88
-msgid "Get Capabilities"
-msgstr ""
+#, fuzzy
+msgid "Get Layers"
+msgstr "الطبقات"
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124
@@ -20213,10 +20219,7 @@
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:126
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:161
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:236
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:254
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:273
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:277
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:310
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:222
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:244
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:262
 msgid "WMS Error"
 msgstr ""
@@ -20236,17 +20239,14 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:235
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:221
+msgid "Could not parse WMS layer list."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:243
 msgid "Invalid service URL."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:253
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:261
 msgid "Could not retrieve WMS layer list."
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:272
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:276
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:280
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:309
-msgid "Could not parse WMS layer list."
 msgstr ""
 
@@ -25465,7 +25465,6 @@
 
 #: build/trans_presets.java:1506
-#, fuzzy
 msgid "used"
-msgstr "الإستعمال"
+msgstr ""
 
 #: build/trans_presets.java:1508 build/trans_presets.java:1509
@@ -25474,7 +25473,6 @@
 
 #: build/trans_presets.java:1508 build/trans_presets.java:1509
-#, fuzzy
 msgid "oldtimer"
-msgstr "نمر"
+msgstr ""
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Parts"
@@ -26090,7 +26088,6 @@
 
 #: build/trans_presets.java:1828
-#, fuzzy
 msgid "interval"
-msgstr "صناعي"
+msgstr ""
 
 #. item "Travel/Accomodation/Caravan Site" check "Power supply"
@@ -26101,7 +26098,6 @@
 #. item "Travel/Accomodation/Caravan Site" check "Tents allowed"
 #: build/trans_presets.java:1830
-#, fuzzy
 msgid "Tents allowed"
-msgstr "مسموح فقط عقدتين"
+msgstr ""
 
 #. item "Travel/Accomodation/Camping Site"
@@ -28672,7 +28668,6 @@
 #. item "Man Made/Mineshaft" label "Edit Mineshaft"
 #: build/trans_presets.java:2722
-#, fuzzy
 msgid "Edit Mineshaft"
-msgstr "حرّر مارينا"
+msgstr ""
 
 #. item "Man Made/Mineshaft" text "Depth in meters"
@@ -28943,7 +28938,6 @@
 #. item "Amenities/Clock"
 #: build/trans_presets.java:2825
-#, fuzzy
 msgid "Clock"
-msgstr "مرسى"
+msgstr ""
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=clock"
@@ -28951,7 +28945,6 @@
 #. item "Amenities/Clock" label "Edit Clock"
 #: build/trans_presets.java:2828
-#, fuzzy
 msgid "Edit Clock"
-msgstr "حرّر مرسى"
+msgstr ""
 
 #. <key key="amenity" value="clock" />
@@ -28959,33 +28952,27 @@
 #. item "Amenities/Clock" combo "Display"
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "Display"
-msgstr "جزيرة"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "analog"
-msgstr "قناة"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "digital"
-msgstr "حرّر سكة"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "sundial"
-msgstr "سنّي"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "unorthodox"
-msgstr "أرثدكس"
+msgstr ""
 
 #. item "Amenities/Clock" combo "Support"
 #: build/trans_presets.java:2832
-#, fuzzy
 msgid "Support"
-msgstr "رياضة"
+msgstr ""
 
 #: build/trans_presets.java:2832
@@ -29016,7 +29003,6 @@
 #. item "Amenities/Clock" check "Shows current date"
 #: build/trans_presets.java:2834
-#, fuzzy
 msgid "Shows current date"
-msgstr "إحفظ المعطيات الحالية."
+msgstr ""
 
 #. item "Amenities/Clock" check "Shows temperature"
@@ -35097,4 +35083,11 @@
 msgstr ""
 
+#.
+#. only for France
+#. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html
+#: build/trans_wms.java:52
+msgid "SPOTMaps (France)"
+msgstr ""
+
 #~ msgid "Unknown version"
 #~ msgstr "نسخة مجهولة"
Index: /applications/editors/josm/i18n/po/bg.po
===================================================================
--- /applications/editors/josm/i18n/po/bg.po	(revision 23466)
+++ /applications/editors/josm/i18n/po/bg.po	(revision 23467)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-01 19:14+0200\n"
-"PO-Revision-Date: 2010-09-05 23:56+0000\n"
+"POT-Creation-Date: 2010-10-03 22:45+0200\n"
+"PO-Revision-Date: 2010-10-01 20:53+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-10-01 16:29+0000\n"
+"X-Launchpad-Export-Date: 2010-10-03 20:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -85,5 +85,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:251
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:515
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:186
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121
@@ -228,5 +228,4 @@
 
 #. Strings in JFileChooser
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
@@ -277,7 +276,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:995
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:992
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119
@@ -302,5 +301,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
-#: build/specialmessages.java:33 build/specialmessages.java:90
+#: build/specialmessages.java:33
 msgid "Cancel"
 msgstr "Отмяна"
@@ -422,5 +421,5 @@
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:42
-#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:40
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -675,5 +674,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:145
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:509
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
@@ -1557,6 +1556,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:112
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:834
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:844
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:831
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:841
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:64
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:78
@@ -1620,5 +1619,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
-#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1327
+#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1340
 #: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1406
 #: build/specialmessages.java:65
@@ -1734,5 +1733,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
-#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1300
+#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1313
 #: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1382
 msgid "Close"
@@ -1785,5 +1784,4 @@
 msgstr "Моля изберете поне един път за опростяване."
 
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
@@ -1791,5 +1789,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:87
-#: build/specialmessages.java:88
 msgid "Yes"
 msgstr "Да"
@@ -2518,5 +2515,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:783
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:108
@@ -2934,5 +2931,5 @@
 "ключ=стойност."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:459
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:449
 #, java-format
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
@@ -2941,36 +2938,36 @@
 "връзка."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:641
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:631
 #, java-format
 msgid "Unexpected token. Expected {0}, found {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:656
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:646
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr "Неочакван знак: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:667
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:657
 msgid "Missing parameter for OR"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:692
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:682
 msgid "Missing operator for NOT"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:689
+msgid "Primitive id expected"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:691
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:694
+msgid "Range of numbers expected"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:697
+msgid "Changeset id expected"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:699
-msgid "Primitive id expected"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:701
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:704
-msgid "Range of numbers expected"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:707
-msgid "Changeset id expected"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:709
 msgid "Version expected"
 msgstr ""
@@ -3027,5 +3024,4 @@
 
 #. Strings in JFileChooser
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
@@ -3056,5 +3052,5 @@
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:686
-#: build/specialmessages.java:58 build/specialmessages.java:87
+#: build/specialmessages.java:58
 msgid "OK"
 msgstr "ОК"
@@ -3667,5 +3663,5 @@
 msgstr "И"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:243
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:258
 #, java-format
 msgid ""
@@ -3673,5 +3669,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:651
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:666
 #, java-format
 msgid ""
@@ -4515,5 +4511,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
 msgid "Presets"
@@ -6459,5 +6455,5 @@
 #. item "Highways/Streets/Roundabout" text "Name"
 #. <space />
-#. <key key="bridge" value="yes" />
+#. unparsed line             <combo key="bridge" values="yes,viaduct,swing,aqueduct" required="true" default="yes" text="Bridge" />
 #. <optional>
 #. item "Highways/Streets/Bridge" text "Name"
@@ -7752,5 +7748,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:572
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:639
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:146
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:143
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
 msgid "<different>"
@@ -9184,9 +9180,7 @@
 msgstr ""
 
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
-#: build/specialmessages.java:89
 msgid "No"
 msgstr "Не"
@@ -12099,5 +12093,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:489
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:512
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:514
 msgid "Please select an entry."
 msgstr "Моля, изберете елемент."
@@ -12518,38 +12512,38 @@
 msgstr "Шаблони за маркиране"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:266
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:270
 msgid "Actions"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:396
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:418
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:400
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:422
 msgid "Separator"
 msgstr "Разделител"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:580
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:584
 msgid "Toolbar"
 msgstr "Лента с инструменти"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:584
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:588
 msgid "Available"
 msgstr "Наличен"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:623
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:627
 msgid "Action parameters"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:624
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:628
 msgid "Parameter name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:625
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:629
 msgid "Parameter value"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:630
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:634
 msgid "Toolbar customization"
 msgstr "Настройка на панела с инструменти"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:631
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:635
 msgid "Customize the elements on the toolbar."
 msgstr "Настройка на елеметите на панела с инструменти"
@@ -12855,5 +12849,5 @@
 msgstr "Добавяне на нов етикет"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:384
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:381
 #, java-format
 msgid ""
@@ -12862,49 +12856,49 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:514
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:511
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:314
 msgid "More information about this feature"
 msgstr "Повече информация за тази възможност"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:551
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:548
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:605
+msgid "Available roles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:606
+msgid "role"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607
+msgid "count"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:608
-msgid "Available roles"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:609
-msgid "role"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:610
-msgid "count"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:611
 msgid "elements"
 msgstr ""
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:626
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:623
 msgid "Optional Attributes:"
 msgstr "Незадължителни Атрибути:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:724
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:721
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Неизвестен тип: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:792
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:789
 msgid "Preset role element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:800
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:797
 msgid "Preset sub element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:833
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:830
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -12914,15 +12908,15 @@
 msgstr "Не може да се прочете източник на шаблони за маркиране: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:843
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:840
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Грешка при разбор {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:884
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:881
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Елементи от тип {0} се поддържат."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:980
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:977
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -12932,22 +12926,22 @@
 msgstr[1] "Промяна {0} обекта"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:983
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:980
 msgid "Nothing selected!"
 msgstr "Нищо не е избрано!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:985
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:982
 msgid "Selection unsuitable!"
 msgstr "Селекцията е неподходяща!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:995
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:992
 msgid "Apply Preset"
 msgstr "Прилагане шаблон"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
 msgid "New relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1083
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1080
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -12976,9 +12970,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:273
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:278
 msgid "Show only applicable to selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:295
 msgid "Search in tags"
 msgstr ""
@@ -18178,4 +18172,15 @@
 msgstr "Фон при избледняване: "
 
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:40
+#, fuzzy
+msgid "Seamap Editor"
+msgstr "Разделител"
+
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#, fuzzy
+msgid "Seanap Editor"
+msgstr "Разделител"
+
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:38
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
@@ -20179,5 +20184,5 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:90
 #, java-format
 msgid "{0} {1}% of GPS track"
@@ -20467,6 +20472,7 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88
-msgid "Get Capabilities"
-msgstr ""
+#, fuzzy
+msgid "Get Layers"
+msgstr "Слоеве"
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124
@@ -20478,10 +20484,7 @@
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:126
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:161
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:236
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:254
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:273
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:277
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:310
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:222
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:244
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:262
 msgid "WMS Error"
 msgstr ""
@@ -20501,17 +20504,14 @@
 msgstr "WMS URL"
 
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:235
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:221
+msgid "Could not parse WMS layer list."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:243
 msgid "Invalid service URL."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:253
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:261
 msgid "Could not retrieve WMS layer list."
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:272
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:276
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:280
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:309
-msgid "Could not parse WMS layer list."
 msgstr ""
 
@@ -22922,7 +22922,6 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. axleload (tonnes)"
 #: build/trans_presets.java:416
-#, fuzzy
 msgid "Max. axleload (tonnes)"
-msgstr "Макс. маса (т)"
+msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
@@ -25775,7 +25774,6 @@
 
 #: build/trans_presets.java:1506
-#, fuzzy
 msgid "used"
-msgstr "използване"
+msgstr ""
 
 #: build/trans_presets.java:1508 build/trans_presets.java:1509
@@ -25784,7 +25782,6 @@
 
 #: build/trans_presets.java:1508 build/trans_presets.java:1509
-#, fuzzy
 msgid "oldtimer"
-msgstr "tiger"
+msgstr ""
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Parts"
@@ -26400,7 +26397,6 @@
 
 #: build/trans_presets.java:1828
-#, fuzzy
 msgid "interval"
-msgstr "индустрия"
+msgstr ""
 
 #. item "Travel/Accomodation/Caravan Site" check "Power supply"
@@ -26411,7 +26407,6 @@
 #. item "Travel/Accomodation/Caravan Site" check "Tents allowed"
 #: build/trans_presets.java:1830
-#, fuzzy
 msgid "Tents allowed"
-msgstr "Само два точки е позволено да бъдат избрани"
+msgstr ""
 
 #. item "Travel/Accomodation/Camping Site"
@@ -28982,13 +28977,11 @@
 #. item "Man Made/Mineshaft" label "Edit Mineshaft"
 #: build/trans_presets.java:2722
-#, fuzzy
 msgid "Edit Mineshaft"
-msgstr "Редактирай пристанище за яхти"
+msgstr ""
 
 #. item "Man Made/Mineshaft" text "Depth in meters"
 #: build/trans_presets.java:2725
-#, fuzzy
 msgid "Depth in meters"
-msgstr "Ширина (метри)"
+msgstr ""
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
@@ -29254,7 +29247,6 @@
 #. item "Amenities/Clock"
 #: build/trans_presets.java:2825
-#, fuzzy
 msgid "Clock"
-msgstr "Бетонен блок"
+msgstr ""
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=clock"
@@ -29262,7 +29254,6 @@
 #. item "Amenities/Clock" label "Edit Clock"
 #: build/trans_presets.java:2828
-#, fuzzy
 msgid "Edit Clock"
-msgstr "Редактирай док"
+msgstr ""
 
 #. <key key="amenity" value="clock" />
@@ -29270,33 +29261,27 @@
 #. item "Amenities/Clock" combo "Display"
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "Display"
-msgstr "остров"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "analog"
-msgstr "Канал"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "digital"
-msgstr "Редактирай ЖП Линия"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "sundial"
-msgstr "Сунити"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "unorthodox"
-msgstr "Православие"
+msgstr ""
 
 #. item "Amenities/Clock" combo "Support"
 #: build/trans_presets.java:2832
-#, fuzzy
 msgid "Support"
-msgstr "Спорт"
+msgstr ""
 
 #: build/trans_presets.java:2832
@@ -29305,13 +29290,11 @@
 
 #: build/trans_presets.java:2832
-#, fuzzy
 msgid "billboard"
-msgstr "Стълб"
+msgstr ""
 
 #. item "Amenities/Clock" combo "Visibility/readability"
 #: build/trans_presets.java:2833
-#, fuzzy
 msgid "Visibility/readability"
-msgstr "Видимост"
+msgstr ""
 
 #: build/trans_presets.java:2833
@@ -29329,7 +29312,6 @@
 #. item "Amenities/Clock" check "Shows current date"
 #: build/trans_presets.java:2834
-#, fuzzy
 msgid "Shows current date"
-msgstr "Запазване на текущите данни."
+msgstr ""
 
 #. item "Amenities/Clock" check "Shows temperature"
@@ -35408,4 +35390,11 @@
 #: build/trans_wms.java:49
 msgid "PCN 2006 - Italy"
+msgstr ""
+
+#.
+#. only for France
+#. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html
+#: build/trans_wms.java:52
+msgid "SPOTMaps (France)"
 msgstr ""
 
Index: /applications/editors/josm/i18n/po/cs.po
===================================================================
--- /applications/editors/josm/i18n/po/cs.po	(revision 23466)
+++ /applications/editors/josm/i18n/po/cs.po	(revision 23467)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-01 19:14+0200\n"
-"PO-Revision-Date: 2010-09-30 11:24+0000\n"
-"Last-Translator: Jezevec <Unknown>\n"
+"POT-Creation-Date: 2010-10-03 22:45+0200\n"
+"PO-Revision-Date: 2010-10-01 20:28+0000\n"
+"Last-Translator: bastik <Unknown>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2010-10-01 16:28+0000\n"
+"X-Launchpad-Export-Date: 2010-10-03 20:35+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -85,5 +85,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:251
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:515
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:186
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121
@@ -229,5 +229,4 @@
 
 #. Strings in JFileChooser
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
@@ -278,7 +277,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:995
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:992
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119
@@ -303,5 +302,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
-#: build/specialmessages.java:33 build/specialmessages.java:90
+#: build/specialmessages.java:33
 msgid "Cancel"
 msgstr "Zrušit"
@@ -423,5 +422,5 @@
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:42
-#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:40
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -675,5 +674,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:145
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:509
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
@@ -1561,6 +1560,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:112
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:834
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:844
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:831
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:841
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:64
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:78
@@ -1624,5 +1623,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
-#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1327
+#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1340
 #: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1406
 #: build/specialmessages.java:65
@@ -1738,5 +1737,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
-#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1300
+#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1313
 #: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1382
 msgid "Close"
@@ -1789,5 +1788,4 @@
 msgstr "Vyberte alespoň jednu cestu k zjednodušení."
 
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
@@ -1795,5 +1793,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:87
-#: build/specialmessages.java:88
 msgid "Yes"
 msgstr "Ano"
@@ -2526,5 +2523,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:783
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:108
@@ -2954,41 +2951,41 @@
 "klíč=hodnota"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:459
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:449
 #, java-format
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
 msgstr "Neznámý prvek: {0}. Povolené hodnoty jsou bod, cesta nebo relace"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:641
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:631
 #, java-format
 msgid "Unexpected token. Expected {0}, found {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:656
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:646
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr "Neočekávaný token: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:667
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:657
 msgid "Missing parameter for OR"
 msgstr "Chybí parametr pro NEBO"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:692
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:682
 msgid "Missing operator for NOT"
 msgstr "Chybějící operátor pro NOT"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:699
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:689
 msgid "Primitive id expected"
 msgstr "Očekáváno ID prvku"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:701
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:704
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:691
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:694
 msgid "Range of numbers expected"
 msgstr "Číselný rozsah byl překročen"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:707
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:697
 msgid "Changeset id expected"
 msgstr "Očekáváno ID sady změn"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:709
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:699
 msgid "Version expected"
 msgstr "Očekávána verze"
@@ -3050,5 +3047,4 @@
 
 #. Strings in JFileChooser
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
@@ -3079,5 +3075,5 @@
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:686
-#: build/specialmessages.java:58 build/specialmessages.java:87
+#: build/specialmessages.java:58
 msgid "OK"
 msgstr "OK"
@@ -3691,5 +3687,5 @@
 msgstr "V"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:243
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:258
 #, java-format
 msgid ""
@@ -3697,5 +3693,5 @@
 msgstr "Prvek {0} nelze přidat do datové sady, jelikož v ní již je"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:651
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:666
 #, java-format
 msgid ""
@@ -4544,5 +4540,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
 msgid "Presets"
@@ -6537,5 +6533,5 @@
 #. item "Highways/Streets/Roundabout" text "Name"
 #. <space />
-#. <key key="bridge" value="yes" />
+#. unparsed line             <combo key="bridge" values="yes,viaduct,swing,aqueduct" required="true" default="yes" text="Bridge" />
 #. <optional>
 #. item "Highways/Streets/Bridge" text "Name"
@@ -7838,5 +7834,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:572
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:639
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:146
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:143
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
 msgid "<different>"
@@ -9308,9 +9304,7 @@
 msgstr "Vyberte soubor"
 
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
-#: build/specialmessages.java:89
 msgid "No"
 msgstr "Ne"
@@ -12271,5 +12265,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:489
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:512
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:514
 msgid "Please select an entry."
 msgstr "Prosím, vyberte položku."
@@ -12693,38 +12687,38 @@
 msgstr "Přednastavení tagů"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:266
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:270
 msgid "Actions"
 msgstr "Akce"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:396
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:418
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:400
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:422
 msgid "Separator"
 msgstr "Oddělovač"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:580
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:584
 msgid "Toolbar"
 msgstr "Panel nástrojů"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:584
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:588
 msgid "Available"
 msgstr "Dostupné"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:623
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:627
 msgid "Action parameters"
 msgstr "Parametry akce"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:624
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:628
 msgid "Parameter name"
 msgstr "Jméno parametru"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:625
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:629
 msgid "Parameter value"
 msgstr "Hodnota parametru"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:630
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:634
 msgid "Toolbar customization"
 msgstr "Upravení panelu nástrojů"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:631
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:635
 msgid "Customize the elements on the toolbar."
 msgstr "Upravit prvky v panelu nástrojů."
@@ -13053,5 +13047,5 @@
 msgstr "Přidat nový tag"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:384
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:381
 #, java-format
 msgid ""
@@ -13060,49 +13054,49 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:514
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:511
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:314
 msgid "More information about this feature"
 msgstr "Více informací o tomto přednastavení"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:551
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:548
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:608
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:605
 msgid "Available roles"
 msgstr "Dostupné role"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:609
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:606
 msgid "role"
 msgstr "role"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:610
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607
 msgid "count"
 msgstr "počet"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:611
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:608
 msgid "elements"
 msgstr ""
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:626
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:623
 msgid "Optional Attributes:"
 msgstr "Volitelné atributy:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:724
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:721
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Neznámý typ: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:792
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:789
 msgid "Preset role element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:800
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:797
 msgid "Preset sub element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:833
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:830
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -13112,15 +13106,15 @@
 msgstr "Nelze načíst zdroj přednastavených tagů: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:843
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:840
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Chyba parsování {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:884
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:881
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Objekty typu {0} nejsou podporovány."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:980
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:977
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -13131,22 +13125,22 @@
 msgstr[2] "Změnit {0} objektů"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:983
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:980
 msgid "Nothing selected!"
 msgstr "Nic není zvoleno!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:985
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:982
 msgid "Selection unsuitable!"
 msgstr "Vybrány nevhodné objekty!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:995
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:992
 msgid "Apply Preset"
 msgstr "Aplikovat přednastavení"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
 msgid "New relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1083
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1080
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -13175,9 +13169,9 @@
 msgstr "Najít předvolby"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:273
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:278
 msgid "Show only applicable to selection"
 msgstr "Zobrazit pouze aplikovatelné na výběr"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:295
 msgid "Search in tags"
 msgstr "Hledat ve značkách (tags)"
@@ -18427,4 +18421,15 @@
 msgstr "Ztlumit pozadí: "
 
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:40
+#, fuzzy
+msgid "Seamap Editor"
+msgstr "Oddělovač"
+
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#, fuzzy
+msgid "Seanap Editor"
+msgstr "Oddělovač"
+
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:38
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
@@ -20433,5 +20438,5 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:90
 #, java-format
 msgid "{0} {1}% of GPS track"
@@ -20721,6 +20726,7 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88
-msgid "Get Capabilities"
-msgstr ""
+#, fuzzy
+msgid "Get Layers"
+msgstr "Vrstvy"
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124
@@ -20732,10 +20738,7 @@
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:126
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:161
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:236
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:254
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:273
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:277
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:310
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:222
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:244
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:262
 msgid "WMS Error"
 msgstr ""
@@ -20755,17 +20758,14 @@
 msgstr "WMS URL"
 
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:235
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:221
+msgid "Could not parse WMS layer list."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:243
 msgid "Invalid service URL."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:253
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:261
 msgid "Could not retrieve WMS layer list."
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:272
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:276
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:280
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:309
-msgid "Could not parse WMS layer list."
 msgstr ""
 
@@ -23187,7 +23187,6 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. axleload (tonnes)"
 #: build/trans_presets.java:416
-#, fuzzy
 msgid "Max. axleload (tonnes)"
-msgstr "Max. hmotnost (tun)"
+msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
@@ -26040,7 +26039,6 @@
 
 #: build/trans_presets.java:1506
-#, fuzzy
 msgid "used"
-msgstr "nepoužito"
+msgstr ""
 
 #: build/trans_presets.java:1508 build/trans_presets.java:1509
@@ -26049,7 +26047,6 @@
 
 #: build/trans_presets.java:1508 build/trans_presets.java:1509
-#, fuzzy
 msgid "oldtimer"
-msgstr "adresář"
+msgstr ""
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Parts"
@@ -26661,12 +26658,10 @@
 #. item "Travel/Accomodation/Caravan Site" combo "Requires a fee"
 #: build/trans_presets.java:1828
-#, fuzzy
 msgid "Requires a fee"
-msgstr "Požadavek selhal"
+msgstr ""
 
 #: build/trans_presets.java:1828
-#, fuzzy
 msgid "interval"
-msgstr "průmysl"
+msgstr ""
 
 #. item "Travel/Accomodation/Caravan Site" check "Power supply"
@@ -26677,7 +26672,6 @@
 #. item "Travel/Accomodation/Caravan Site" check "Tents allowed"
 #: build/trans_presets.java:1830
-#, fuzzy
 msgid "Tents allowed"
-msgstr "Test selhal"
+msgstr ""
 
 #. item "Travel/Accomodation/Camping Site"
@@ -29248,13 +29242,11 @@
 #. item "Man Made/Mineshaft" label "Edit Mineshaft"
 #: build/trans_presets.java:2722
-#, fuzzy
 msgid "Edit Mineshaft"
-msgstr "Upravit přístav"
+msgstr ""
 
 #. item "Man Made/Mineshaft" text "Depth in meters"
 #: build/trans_presets.java:2725
-#, fuzzy
 msgid "Depth in meters"
-msgstr "Parametry akce"
+msgstr ""
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
@@ -29520,7 +29512,6 @@
 #. item "Amenities/Clock"
 #: build/trans_presets.java:2825
-#, fuzzy
 msgid "Clock"
-msgstr "Zátarasa"
+msgstr ""
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=clock"
@@ -29528,7 +29519,6 @@
 #. item "Amenities/Clock" label "Edit Clock"
 #: build/trans_presets.java:2828
-#, fuzzy
 msgid "Edit Clock"
-msgstr "Upravit dok"
+msgstr ""
 
 #. <key key="amenity" value="clock" />
@@ -29536,33 +29526,27 @@
 #. item "Amenities/Clock" combo "Display"
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "Display"
-msgstr "ostrov"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "analog"
-msgstr "Plavební kanál"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "digital"
-msgstr "Upravit železnici"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "sundial"
-msgstr "sunnitské"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "unorthodox"
-msgstr "pravoslavné"
+msgstr ""
 
 #. item "Amenities/Clock" combo "Support"
 #: build/trans_presets.java:2832
-#, fuzzy
 msgid "Support"
-msgstr "Sport"
+msgstr ""
 
 #: build/trans_presets.java:2832
@@ -29571,18 +29555,15 @@
 
 #: build/trans_presets.java:2832
-#, fuzzy
 msgid "billboard"
-msgstr "Sloupek"
+msgstr ""
 
 #. item "Amenities/Clock" combo "Visibility/readability"
 #: build/trans_presets.java:2833
-#, fuzzy
 msgid "Visibility/readability"
-msgstr "Viditelnost"
+msgstr ""
 
 #: build/trans_presets.java:2833
-#, fuzzy
 msgid "(up to 5m)"
-msgstr "do dlaždice"
+msgstr ""
 
 #: build/trans_presets.java:2833
@@ -29596,7 +29577,6 @@
 #. item "Amenities/Clock" check "Shows current date"
 #: build/trans_presets.java:2834
-#, fuzzy
 msgid "Shows current date"
-msgstr "Uložit aktuální data."
+msgstr ""
 
 #. item "Amenities/Clock" check "Shows temperature"
@@ -29612,7 +29592,6 @@
 #. item "Amenities/Clock" check "Shows humidity"
 #: build/trans_presets.java:2837
-#, fuzzy
 msgid "Shows humidity"
-msgstr "Zobrazit historii"
+msgstr ""
 
 #. </optional>
@@ -35676,4 +35655,11 @@
 #: build/trans_wms.java:49
 msgid "PCN 2006 - Italy"
+msgstr ""
+
+#.
+#. only for France
+#. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html
+#: build/trans_wms.java:52
+msgid "SPOTMaps (France)"
 msgstr ""
 
Index: /applications/editors/josm/i18n/po/da.po
===================================================================
--- /applications/editors/josm/i18n/po/da.po	(revision 23466)
+++ /applications/editors/josm/i18n/po/da.po	(revision 23467)
@@ -9,6 +9,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-01 19:14+0200\n"
-"PO-Revision-Date: 2010-09-29 11:43+0000\n"
+"POT-Creation-Date: 2010-10-03 22:45+0200\n"
+"PO-Revision-Date: 2010-10-01 20:34+0000\n"
 "Last-Translator: Jens Hyllegaard <jens@linushvj.dk>\n"
 "Language-Team: Dansk <kde-i18n-doc@kde.org>\n"
@@ -17,5 +17,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-10-01 16:28+0000\n"
+"X-Launchpad-Export-Date: 2010-10-03 20:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -86,5 +86,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:251
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:515
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:186
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121
@@ -229,5 +229,4 @@
 
 #. Strings in JFileChooser
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
@@ -278,7 +277,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:995
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:992
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119
@@ -303,5 +302,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
-#: build/specialmessages.java:33 build/specialmessages.java:90
+#: build/specialmessages.java:33
 msgid "Cancel"
 msgstr "Annuller"
@@ -423,5 +422,5 @@
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:42
-#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:40
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -677,5 +676,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:145
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:509
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
@@ -1573,6 +1572,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:112
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:834
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:844
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:831
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:841
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:64
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:78
@@ -1636,5 +1635,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
-#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1327
+#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1340
 #: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1406
 #: build/specialmessages.java:65
@@ -1748,5 +1747,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
-#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1300
+#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1313
 #: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1382
 msgid "Close"
@@ -1799,5 +1798,4 @@
 msgstr "Vælg venligst mindst en vej at forenkle"
 
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
@@ -1805,5 +1803,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:87
-#: build/specialmessages.java:88
 msgid "Yes"
 msgstr "Ja"
@@ -2531,5 +2528,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:783
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:108
@@ -2970,5 +2967,5 @@
 msgstr "Nøgle kan ikke være tom når tag operatør bruges. Eksempel: nøgle=værdi"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:459
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:449
 #, java-format
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
@@ -2976,36 +2973,36 @@
 "Ukendt primitiv type: {0}. Tilladte værdier er node, way eller relation"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:641
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:631
 #, java-format
 msgid "Unexpected token. Expected {0}, found {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:656
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:646
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr "Uventet symbol: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:667
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:657
 msgid "Missing parameter for OR"
 msgstr "Manglende parameter for OR"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:692
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:682
 msgid "Missing operator for NOT"
 msgstr "Manglende operatør for NOT"
 
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:689
+msgid "Primitive id expected"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:691
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:694
+msgid "Range of numbers expected"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:697
+msgid "Changeset id expected"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:699
-msgid "Primitive id expected"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:701
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:704
-msgid "Range of numbers expected"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:707
-msgid "Changeset id expected"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:709
 msgid "Version expected"
 msgstr ""
@@ -3069,5 +3066,4 @@
 
 #. Strings in JFileChooser
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
@@ -3098,5 +3094,5 @@
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:686
-#: build/specialmessages.java:58 build/specialmessages.java:87
+#: build/specialmessages.java:58
 msgid "OK"
 msgstr "OK"
@@ -3720,5 +3716,5 @@
 msgstr "Ø"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:243
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:258
 #, java-format
 msgid ""
@@ -3728,5 +3724,5 @@
 "allerede er inkluderet"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:651
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:666
 #, java-format
 msgid ""
@@ -4586,5 +4582,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
 msgid "Presets"
@@ -6605,5 +6601,5 @@
 #. item "Highways/Streets/Roundabout" text "Name"
 #. <space />
-#. <key key="bridge" value="yes" />
+#. unparsed line             <combo key="bridge" values="yes,viaduct,swing,aqueduct" required="true" default="yes" text="Bridge" />
 #. <optional>
 #. item "Highways/Streets/Bridge" text "Name"
@@ -7927,5 +7923,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:572
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:639
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:146
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:143
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
 msgid "<different>"
@@ -9422,9 +9418,7 @@
 msgstr "Vælg filnavn"
 
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
-#: build/specialmessages.java:89
 msgid "No"
 msgstr "Nej"
@@ -12432,5 +12426,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:489
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:512
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:514
 msgid "Please select an entry."
 msgstr "Vælg venligst en post."
@@ -12856,38 +12850,38 @@
 msgstr "Fordefinerede tags"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:266
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:270
 msgid "Actions"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:396
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:418
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:400
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:422
 msgid "Separator"
 msgstr "Separator"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:580
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:584
 msgid "Toolbar"
 msgstr "Værktøjslinje"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:584
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:588
 msgid "Available"
 msgstr "Tilgængelige"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:623
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:627
 msgid "Action parameters"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:624
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:628
 msgid "Parameter name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:625
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:629
 msgid "Parameter value"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:630
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:634
 msgid "Toolbar customization"
 msgstr "Tilpasning af værktøjslinje"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:631
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:635
 msgid "Customize the elements on the toolbar."
 msgstr "Tilpas elementerne på værktøjslinjen."
@@ -13221,5 +13215,5 @@
 msgstr "Tilføj en ny tag"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:384
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:381
 #, java-format
 msgid ""
@@ -13228,49 +13222,49 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:514
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:511
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:314
 msgid "More information about this feature"
 msgstr "Mere information om denne feature"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:551
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:548
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:608
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:605
 msgid "Available roles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:609
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:606
 msgid "role"
 msgstr "rolle"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:610
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607
 msgid "count"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:611
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:608
 msgid "elements"
 msgstr "elementer"
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:626
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:623
 msgid "Optional Attributes:"
 msgstr "Valgfri attributter:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:724
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:721
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Ukendt type: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:792
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:789
 msgid "Preset role element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:800
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:797
 msgid "Preset sub element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:833
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:830
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -13280,15 +13274,15 @@
 msgstr "Kunne ikke læse kilde med fordefinerede tags: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:843
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:840
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Fejl ved fortolkning af {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:884
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:881
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Elementer af typen {0} er understøttet."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:980
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:977
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -13298,22 +13292,22 @@
 msgstr[1] "Ret {0} objekter"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:983
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:980
 msgid "Nothing selected!"
 msgstr "Intet er valgt!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:985
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:982
 msgid "Selection unsuitable!"
 msgstr "Markering uegnet!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:995
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:992
 msgid "Apply Preset"
 msgstr "Anvend fordefinition"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
 msgid "New relation"
 msgstr "Ny relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1083
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1080
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -13342,9 +13336,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:273
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:278
 msgid "Show only applicable to selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:295
 msgid "Search in tags"
 msgstr ""
@@ -18586,4 +18580,15 @@
 msgstr "Nedton baggrund: "
 
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:40
+#, fuzzy
+msgid "Seamap Editor"
+msgstr "Separator"
+
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#, fuzzy
+msgid "Seanap Editor"
+msgstr "Separator"
+
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:38
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
@@ -20591,5 +20596,5 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:90
 #, java-format
 msgid "{0} {1}% of GPS track"
@@ -20890,6 +20895,7 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88
-msgid "Get Capabilities"
-msgstr ""
+#, fuzzy
+msgid "Get Layers"
+msgstr "Lag"
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124
@@ -20901,10 +20907,7 @@
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:126
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:161
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:236
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:254
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:273
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:277
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:310
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:222
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:244
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:262
 msgid "WMS Error"
 msgstr ""
@@ -20924,17 +20927,14 @@
 msgstr "WMS-URL"
 
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:235
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:221
+msgid "Could not parse WMS layer list."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:243
 msgid "Invalid service URL."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:253
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:261
 msgid "Could not retrieve WMS layer list."
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:272
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:276
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:280
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:309
-msgid "Could not parse WMS layer list."
 msgstr ""
 
@@ -23354,7 +23354,6 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. axleload (tonnes)"
 #: build/trans_presets.java:416
-#, fuzzy
 msgid "Max. axleload (tonnes)"
-msgstr "Maks. vægt (ton)"
+msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
@@ -26207,7 +26206,6 @@
 
 #: build/trans_presets.java:1506
-#, fuzzy
 msgid "used"
-msgstr "brug"
+msgstr ""
 
 #: build/trans_presets.java:1508 build/trans_presets.java:1509
@@ -26216,7 +26214,6 @@
 
 #: build/trans_presets.java:1508 build/trans_presets.java:1509
-#, fuzzy
 msgid "oldtimer"
-msgstr "mappe"
+msgstr ""
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Parts"
@@ -26828,12 +26825,10 @@
 #. item "Travel/Accomodation/Caravan Site" combo "Requires a fee"
 #: build/trans_presets.java:1828
-#, fuzzy
 msgid "Requires a fee"
-msgstr "Anmodning fejlede"
+msgstr ""
 
 #: build/trans_presets.java:1828
-#, fuzzy
 msgid "interval"
-msgstr "industri"
+msgstr ""
 
 #. item "Travel/Accomodation/Caravan Site" check "Power supply"
@@ -26844,7 +26839,6 @@
 #. item "Travel/Accomodation/Caravan Site" check "Tents allowed"
 #: build/trans_presets.java:1830
-#, fuzzy
 msgid "Tents allowed"
-msgstr "Testen fejlede"
+msgstr ""
 
 #. item "Travel/Accomodation/Camping Site"
@@ -29415,13 +29409,11 @@
 #. item "Man Made/Mineshaft" label "Edit Mineshaft"
 #: build/trans_presets.java:2722
-#, fuzzy
 msgid "Edit Mineshaft"
-msgstr "Ret lystbådehavn"
+msgstr ""
 
 #. item "Man Made/Mineshaft" text "Depth in meters"
 #: build/trans_presets.java:2725
-#, fuzzy
 msgid "Depth in meters"
-msgstr "Bredde (meter)"
+msgstr ""
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
@@ -29687,7 +29679,6 @@
 #. item "Amenities/Clock"
 #: build/trans_presets.java:2825
-#, fuzzy
 msgid "Clock"
-msgstr "Dok"
+msgstr ""
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=clock"
@@ -29695,7 +29686,6 @@
 #. item "Amenities/Clock" label "Edit Clock"
 #: build/trans_presets.java:2828
-#, fuzzy
 msgid "Edit Clock"
-msgstr "Ret dok"
+msgstr ""
 
 #. <key key="amenity" value="clock" />
@@ -29703,33 +29693,27 @@
 #. item "Amenities/Clock" combo "Display"
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "Display"
-msgstr "helleanlæg"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "analog"
-msgstr "Kanal"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "digital"
-msgstr "Ret spor"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "sundial"
-msgstr "sunnitisk"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "unorthodox"
-msgstr "ortodoks"
+msgstr ""
 
 #. item "Amenities/Clock" combo "Support"
 #: build/trans_presets.java:2832
-#, fuzzy
 msgid "Support"
-msgstr "Sport"
+msgstr ""
 
 #: build/trans_presets.java:2832
@@ -29738,18 +29722,15 @@
 
 #: build/trans_presets.java:2832
-#, fuzzy
 msgid "billboard"
-msgstr "Pæl"
+msgstr ""
 
 #. item "Amenities/Clock" combo "Visibility/readability"
 #: build/trans_presets.java:2833
-#, fuzzy
 msgid "Visibility/readability"
-msgstr "Synlighed"
+msgstr ""
 
 #: build/trans_presets.java:2833
-#, fuzzy
 msgid "(up to 5m)"
-msgstr "op til tern"
+msgstr ""
 
 #: build/trans_presets.java:2833
@@ -29763,7 +29744,6 @@
 #. item "Amenities/Clock" check "Shows current date"
 #: build/trans_presets.java:2834
-#, fuzzy
 msgid "Shows current date"
-msgstr "Gem nuværende data."
+msgstr ""
 
 #. item "Amenities/Clock" check "Shows temperature"
@@ -29779,7 +29759,6 @@
 #. item "Amenities/Clock" check "Shows humidity"
 #: build/trans_presets.java:2837
-#, fuzzy
 msgid "Shows humidity"
-msgstr "Vis historik"
+msgstr ""
 
 #. </optional>
@@ -35843,4 +35822,11 @@
 #: build/trans_wms.java:49
 msgid "PCN 2006 - Italy"
+msgstr ""
+
+#.
+#. only for France
+#. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html
+#: build/trans_wms.java:52
+msgid "SPOTMaps (France)"
 msgstr ""
 
Index: /applications/editors/josm/i18n/po/de.po
===================================================================
--- /applications/editors/josm/i18n/po/de.po	(revision 23466)
+++ /applications/editors/josm/i18n/po/de.po	(revision 23467)
@@ -8,6 +8,6 @@
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-01 19:14+0200\n"
-"PO-Revision-Date: 2010-09-28 15:46+0000\n"
+"POT-Creation-Date: 2010-10-03 22:45+0200\n"
+"PO-Revision-Date: 2010-10-03 09:08+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: <de@li.org>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-10-01 16:22+0000\n"
+"X-Launchpad-Export-Date: 2010-10-03 20:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -85,5 +85,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:251
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:515
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:186
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121
@@ -230,5 +230,4 @@
 
 #. Strings in JFileChooser
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
@@ -279,7 +278,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:995
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:992
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119
@@ -304,5 +303,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
-#: build/specialmessages.java:33 build/specialmessages.java:90
+#: build/specialmessages.java:33
 msgid "Cancel"
 msgstr "Abbrechen"
@@ -426,5 +425,5 @@
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:42
-#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:40
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -681,5 +680,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:145
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:509
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
@@ -1597,6 +1596,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:112
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:834
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:844
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:831
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:841
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:64
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:78
@@ -1660,5 +1659,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
-#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1327
+#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1340
 #: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1406
 #: build/specialmessages.java:65
@@ -1773,5 +1772,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
-#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1300
+#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1313
 #: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1382
 msgid "Close"
@@ -1824,5 +1823,4 @@
 msgstr "Bitte mindestens einen Weg zum Vereinfachen auswählen."
 
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
@@ -1830,5 +1828,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:87
-#: build/specialmessages.java:88
 msgid "Yes"
 msgstr "Ja"
@@ -2585,5 +2582,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:783
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:108
@@ -3032,5 +3029,5 @@
 "Schlüssel kann bei Gleichheitsoperator nicht leer sein. Beispiel: feld=wert"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:459
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:449
 #, java-format
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
@@ -3039,36 +3036,36 @@
 "\"relation\"."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:641
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:631
 #, java-format
 msgid "Unexpected token. Expected {0}, found {1}"
 msgstr "Unerwartete Kennung: erwartet {0}, erhalten {1}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:656
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:646
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr "Unerwartete Daten: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:667
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:657
 msgid "Missing parameter for OR"
 msgstr "Fehlendes Argument für 'OR'"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:692
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:682
 msgid "Missing operator for NOT"
 msgstr "Fehlender Operator für 'NOT'."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:699
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:689
 msgid "Primitive id expected"
 msgstr "Erwarte eine Objekt-ID"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:701
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:704
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:691
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:694
 msgid "Range of numbers expected"
 msgstr "Erwarte einen Zahlenbereich"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:707
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:697
 msgid "Changeset id expected"
 msgstr "Änderungssatz-Nummer benötigt"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:709
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:699
 msgid "Version expected"
 msgstr "Version erwartet"
@@ -3134,5 +3131,4 @@
 
 #. Strings in JFileChooser
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
@@ -3163,5 +3159,5 @@
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:686
-#: build/specialmessages.java:58 build/specialmessages.java:87
+#: build/specialmessages.java:58
 msgid "OK"
 msgstr "OK"
@@ -3800,5 +3796,5 @@
 msgstr "O"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:243
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:258
 #, java-format
 msgid ""
@@ -3808,5 +3804,5 @@
 "enthalten ist"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:651
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:666
 #, java-format
 msgid ""
@@ -4695,5 +4691,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
 msgid "Presets"
@@ -6744,5 +6740,5 @@
 #. item "Highways/Streets/Roundabout" text "Name"
 #. <space />
-#. <key key="bridge" value="yes" />
+#. unparsed line             <combo key="bridge" values="yes,viaduct,swing,aqueduct" required="true" default="yes" text="Bridge" />
 #. <optional>
 #. item "Highways/Streets/Bridge" text "Name"
@@ -8084,5 +8080,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:572
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:639
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:146
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:143
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
 msgid "<different>"
@@ -9626,9 +9622,7 @@
 msgstr "Dateinamen wählen"
 
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
-#: build/specialmessages.java:89
 msgid "No"
 msgstr "Nein"
@@ -12775,5 +12769,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:489
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:512
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:514
 msgid "Please select an entry."
 msgstr "Bitte einen Eintrag wählen."
@@ -13236,38 +13230,38 @@
 msgstr "Objektvorlagen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:266
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:270
 msgid "Actions"
 msgstr "Aktionen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:396
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:418
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:400
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:422
 msgid "Separator"
 msgstr "Trenner"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:580
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:584
 msgid "Toolbar"
 msgstr "Werkzeugleiste"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:584
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:588
 msgid "Available"
 msgstr "Verfügbar"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:623
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:627
 msgid "Action parameters"
 msgstr "Aktionsparameter"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:624
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:628
 msgid "Parameter name"
 msgstr "Parameter Name"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:625
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:629
 msgid "Parameter value"
 msgstr "Parameter Wert"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:630
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:634
 msgid "Toolbar customization"
 msgstr "Werkzeugleistenanpassung"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:631
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:635
 msgid "Customize the elements on the toolbar."
 msgstr "Die Elemente auf der Werkzeugleiste anpassen."
@@ -13625,5 +13619,5 @@
 msgstr "Neues Merkmal hinzufügen"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:384
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:381
 #, java-format
 msgid ""
@@ -13634,49 +13628,49 @@
 "''display_values'' muss mit der Anzahl in ''values'' identisch sein."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:514
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:511
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:314
 msgid "More information about this feature"
 msgstr "Mehr Informationen zu dieser Vorlage"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:551
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:548
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr "Unbekannte Vorraussetzung: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:608
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:605
 msgid "Available roles"
 msgstr "Verfügbare Rollen"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:609
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:606
 msgid "role"
 msgstr "Rolle"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:610
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607
 msgid "count"
 msgstr "Anzahl"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:611
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:608
 msgid "elements"
 msgstr "Elemente"
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:626
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:623
 msgid "Optional Attributes:"
 msgstr "Optionale Attribute:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:724
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:721
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Unbekannter Typ: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:792
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:789
 msgid "Preset role element without parent"
 msgstr "Vorlagenelement Rolle ohne Vorgänger"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:800
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:797
 msgid "Preset sub element without parent"
 msgstr "Vorlagenelement ohne Elternelement"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:833
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:830
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -13686,15 +13680,15 @@
 msgstr "Quelle für Objektvorlage konnte nicht gelesen werden: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:843
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:840
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Fehler beim Einlesen von {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:884
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:881
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Elemente des Typs {0} werden unterstützt."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:980
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:977
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -13704,22 +13698,22 @@
 msgstr[1] "Ändere {0} Objekte"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:983
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:980
 msgid "Nothing selected!"
 msgstr "Nichts ausgewählt!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:985
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:982
 msgid "Selection unsuitable!"
 msgstr "Auswahl unpassend!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:995
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:992
 msgid "Apply Preset"
 msgstr "Vorlage anwenden"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
 msgid "New relation"
 msgstr "Neue Relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1083
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1080
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -13748,9 +13742,9 @@
 msgstr "Vorlagen suchen"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:273
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:278
 msgid "Show only applicable to selection"
 msgstr "Nur Einträge passend zur Auswahl zeigen"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:295
 msgid "Search in tags"
 msgstr "Suche in Merkmalen"
@@ -19115,11 +19109,10 @@
 
 #: ../plugins/rgisopen/src/rgisopen/RGISLayerFromFileAction.java:34
-#, fuzzy
 msgid "New picture layer from RGIS..."
-msgstr "Neue Bildebene aus einer Datei..."
+msgstr "Neue Bildebene von RGIS..."
 
 #: ../plugins/rgisopen/src/rgisopen/RGISOpenPlugin.java:33
 msgid "RGIS"
-msgstr ""
+msgstr "RGIS"
 
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87
@@ -19356,4 +19349,15 @@
 msgid "Fade background: "
 msgstr "Hintergrund ausblenden: "
+
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:40
+#, fuzzy
+msgid "Seamap Editor"
+msgstr "Seezeicheneditor"
+
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#, fuzzy
+msgid "Seanap Editor"
+msgstr "Seezeicheneditor"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:38
@@ -21456,5 +21460,5 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:90
 #, java-format
 msgid "{0} {1}% of GPS track"
@@ -21766,6 +21770,6 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88
-msgid "Get Capabilities"
-msgstr "Serverfähigkeiten auslesen"
+msgid "Get Layers"
+msgstr "Ebenen abfragen"
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124
@@ -21780,10 +21784,7 @@
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:126
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:161
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:236
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:254
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:273
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:277
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:310
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:222
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:244
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:262
 msgid "WMS Error"
 msgstr "WMS-Fehler"
@@ -21803,18 +21804,15 @@
 msgstr "WMS-URL"
 
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:235
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:221
+msgid "Could not parse WMS layer list."
+msgstr "Konnte die Liste der WMS-Ebenen nicht auswerten."
+
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:243
 msgid "Invalid service URL."
 msgstr "Ungültige Service-URL."
 
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:253
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:261
 msgid "Could not retrieve WMS layer list."
 msgstr "Konnte die Liste der WMS-Ebenen nicht abfragen."
-
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:272
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:276
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:280
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:309
-msgid "Could not parse WMS layer list."
-msgstr "Konnte die Liste der WMS-Ebenen nicht auswerten."
 
 #: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:76
@@ -22764,5 +22762,5 @@
 #: build/trans_plugins.java:78
 msgid "Use rgis.spb.ru image as overlay"
-msgstr ""
+msgstr "Bilder von rgis.spb.ru als Überlagerung nutzen"
 
 #. Plugin RoadSigns
@@ -23380,7 +23378,6 @@
 #: build/trans_presets.java:588 build/trans_presets.java:611
 #: build/trans_presets.java:630 build/trans_presets.java:651
-#, fuzzy
 msgid "Lit"
-msgstr "Liste"
+msgstr "Beleuchtet"
 
 #. </optional>
@@ -24282,7 +24279,6 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. axleload (tonnes)"
 #: build/trans_presets.java:416
-#, fuzzy
 msgid "Max. axleload (tonnes)"
-msgstr "Max. Gewicht (Tonnen)"
+msgstr "Max. Axlast (Tonnen)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
@@ -27135,7 +27131,6 @@
 
 #: build/trans_presets.java:1506
-#, fuzzy
 msgid "used"
-msgstr "unbenutzt"
+msgstr "benutzt"
 
 #: build/trans_presets.java:1508 build/trans_presets.java:1509
@@ -27144,7 +27139,6 @@
 
 #: build/trans_presets.java:1508 build/trans_presets.java:1509
-#, fuzzy
 msgid "oldtimer"
-msgstr "Verzeichnis"
+msgstr "Oldtimer"
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Parts"
@@ -27752,27 +27746,24 @@
 #: build/trans_presets.java:1827
 msgid "Number of places"
-msgstr ""
+msgstr "Anzahl Plätze"
 
 #. item "Travel/Accomodation/Caravan Site" combo "Requires a fee"
 #: build/trans_presets.java:1828
-#, fuzzy
 msgid "Requires a fee"
-msgstr "Anfrage fehlgeschlagen"
+msgstr "Gebührenpflichtig"
 
 #: build/trans_presets.java:1828
-#, fuzzy
 msgid "interval"
-msgstr "Industriegebiet"
+msgstr "Intervall"
 
 #. item "Travel/Accomodation/Caravan Site" check "Power supply"
 #: build/trans_presets.java:1829
 msgid "Power supply"
-msgstr ""
+msgstr "Stromversorgung"
 
 #. item "Travel/Accomodation/Caravan Site" check "Tents allowed"
 #: build/trans_presets.java:1830
-#, fuzzy
 msgid "Tents allowed"
-msgstr "Test fehlgeschlagen"
+msgstr "Zelte erlaubt"
 
 #. item "Travel/Accomodation/Camping Site"
@@ -30338,18 +30329,16 @@
 #: build/trans_presets.java:2720
 msgid "Mineshaft"
-msgstr ""
+msgstr "Minenschacht"
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dmineshaft" />
 #. item "Man Made/Mineshaft" label "Edit Mineshaft"
 #: build/trans_presets.java:2722
-#, fuzzy
 msgid "Edit Mineshaft"
-msgstr "Jachthafen bearbeiten"
+msgstr "Minenschacht bearbeiten"
 
 #. item "Man Made/Mineshaft" text "Depth in meters"
 #: build/trans_presets.java:2725
-#, fuzzy
 msgid "Depth in meters"
-msgstr "Aktionsparameter"
+msgstr "Tiefe in Metern"
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
@@ -30615,7 +30604,6 @@
 #. item "Amenities/Clock"
 #: build/trans_presets.java:2825
-#, fuzzy
 msgid "Clock"
-msgstr "Steinblock"
+msgstr "Uhr"
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=clock"
@@ -30623,7 +30611,6 @@
 #. item "Amenities/Clock" label "Edit Clock"
 #: build/trans_presets.java:2828
-#, fuzzy
 msgid "Edit Clock"
-msgstr "Dock bearbeiten"
+msgstr "Uhr anpassen"
 
 #. <key key="amenity" value="clock" />
@@ -30631,83 +30618,72 @@
 #. item "Amenities/Clock" combo "Display"
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "Display"
-msgstr "Wiedergabe"
+msgstr "Anzeige"
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "analog"
-msgstr "Kanal"
+msgstr "Analog"
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "digital"
-msgstr "Eisenbahn bearbeiten"
+msgstr "Digital"
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "sundial"
-msgstr "sunnitisch"
+msgstr "Sonnenuhr"
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "unorthodox"
-msgstr "orthodox"
+msgstr "Unkonventionell"
 
 #. item "Amenities/Clock" combo "Support"
 #: build/trans_presets.java:2832
-#, fuzzy
 msgid "Support"
-msgstr "Sport"
+msgstr "Anbringung"
 
 #: build/trans_presets.java:2832
 msgid "wall_mounted"
-msgstr ""
+msgstr "Wanduhr"
 
 #: build/trans_presets.java:2832
-#, fuzzy
 msgid "billboard"
-msgstr "Poller"
+msgstr "Werbeschild"
 
 #. item "Amenities/Clock" combo "Visibility/readability"
 #: build/trans_presets.java:2833
-#, fuzzy
 msgid "Visibility/readability"
-msgstr "Sichtbarkeit"
+msgstr "Ablesbarkeit"
 
 #: build/trans_presets.java:2833
-#, fuzzy
 msgid "(up to 5m)"
-msgstr "bis Kachel"
+msgstr "(bis zu 5m)"
 
 #: build/trans_presets.java:2833
 msgid "(up to 20m)"
-msgstr ""
+msgstr "(bis zu 20m)"
 
 #: build/trans_presets.java:2833
 msgid "(more than 20m)"
-msgstr ""
+msgstr "(mehr als 20m)"
 
 #. item "Amenities/Clock" check "Shows current date"
 #: build/trans_presets.java:2834
-#, fuzzy
 msgid "Shows current date"
-msgstr "Aktuelle Daten speichern."
+msgstr "Datumsanzeige"
 
 #. item "Amenities/Clock" check "Shows temperature"
 #: build/trans_presets.java:2835
 msgid "Shows temperature"
-msgstr ""
+msgstr "Temperaturanzeige"
 
 #. item "Amenities/Clock" check "Shows barometric pressure"
 #: build/trans_presets.java:2836
 msgid "Shows barometric pressure"
-msgstr ""
+msgstr "Luftdruckanzeige"
 
 #. item "Amenities/Clock" check "Shows humidity"
 #: build/trans_presets.java:2837
-#, fuzzy
 msgid "Shows humidity"
-msgstr "Versionsprotokoll anzeigen"
+msgstr "Feuchtigkeitsanzeige"
 
 #. </optional>
@@ -36773,6 +36749,14 @@
 msgstr "PCN 2006 - Italy"
 
-#~ msgid "Plugin for Seamap Editor"
-#~ msgstr "Plugin für Seekarteneditor"
+#.
+#. only for France
+#. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html
+#: build/trans_wms.java:52
+#, fuzzy
+msgid "SPOTMaps (France)"
+msgstr "UTM-Frankreich (DOM)"
+
+#~ msgid "Get Capabilities"
+#~ msgstr "Serverfähigkeiten auslesen"
 
 #~ msgid "Create non-audio markers when reading GPX."
@@ -37160,7 +37144,4 @@
 #~ msgstr "Hausnummern- und Straßennamenrelation erzeugen"
 
-#~ msgid "Seamark Editor"
-#~ msgstr "Seezeicheneditor"
-
 #~ msgid "Edit OpenSeaMap"
 #~ msgstr "OpenSeaMap bearbeiten"
@@ -37169,7 +37150,7 @@
 #~ msgstr "Anspringen"
 
-#~ msgid "Get Layers"
-#~ msgstr "Ebenen abfragen"
-
 #~ msgid "Add relation"
 #~ msgstr "Relation hinzufügen"
+
+#~ msgid "Plugin for Seamap Editor"
+#~ msgstr "Plugin für Seekarteneditor"
Index: /applications/editors/josm/i18n/po/el.po
===================================================================
--- /applications/editors/josm/i18n/po/el.po	(revision 23466)
+++ /applications/editors/josm/i18n/po/el.po	(revision 23467)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-01 19:14+0200\n"
-"PO-Revision-Date: 2010-09-25 13:26+0000\n"
+"POT-Creation-Date: 2010-10-03 22:45+0200\n"
+"PO-Revision-Date: 2010-10-01 20:57+0000\n"
 "Last-Translator: bastik <Unknown>\n"
 "Language-Team: Greek <el@li.org>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-10-01 16:26+0000\n"
+"X-Launchpad-Export-Date: 2010-10-03 20:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -85,5 +85,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:251
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:515
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:186
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121
@@ -222,5 +222,4 @@
 
 #. Strings in JFileChooser
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
@@ -271,7 +270,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:995
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:992
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119
@@ -296,5 +295,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
-#: build/specialmessages.java:33 build/specialmessages.java:90
+#: build/specialmessages.java:33
 msgid "Cancel"
 msgstr "Ακύρωση"
@@ -415,5 +414,5 @@
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:42
-#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:40
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -668,5 +667,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:145
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:509
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
@@ -1554,6 +1553,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:112
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:834
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:844
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:831
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:841
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:64
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:78
@@ -1617,5 +1616,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
-#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1327
+#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1340
 #: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1406
 #: build/specialmessages.java:65
@@ -1729,5 +1728,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
-#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1300
+#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1313
 #: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1382
 msgid "Close"
@@ -1780,5 +1779,4 @@
 msgstr "Παρακαλώ επιλέξτε τουλάχιστον μια διαδρομή προς απλοποίηση."
 
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
@@ -1786,5 +1784,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:87
-#: build/specialmessages.java:88
 msgid "Yes"
 msgstr "Ναι"
@@ -2506,5 +2503,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:783
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:108
@@ -2916,41 +2913,41 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:459
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:449
 #, java-format
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:641
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:631
 #, java-format
 msgid "Unexpected token. Expected {0}, found {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:656
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:646
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:667
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:657
 msgid "Missing parameter for OR"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:692
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:682
 msgid "Missing operator for NOT"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:689
+msgid "Primitive id expected"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:691
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:694
+msgid "Range of numbers expected"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:697
+msgid "Changeset id expected"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:699
-msgid "Primitive id expected"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:701
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:704
-msgid "Range of numbers expected"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:707
-msgid "Changeset id expected"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:709
 msgid "Version expected"
 msgstr ""
@@ -3007,5 +3004,4 @@
 
 #. Strings in JFileChooser
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
@@ -3036,5 +3032,5 @@
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:686
-#: build/specialmessages.java:58 build/specialmessages.java:87
+#: build/specialmessages.java:58
 msgid "OK"
 msgstr "Εντάξει"
@@ -3630,5 +3626,5 @@
 msgstr "Α"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:243
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:258
 #, java-format
 msgid ""
@@ -3636,5 +3632,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:651
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:666
 #, java-format
 msgid ""
@@ -4474,5 +4470,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
 msgid "Presets"
@@ -6420,5 +6416,5 @@
 #. item "Highways/Streets/Roundabout" text "Name"
 #. <space />
-#. <key key="bridge" value="yes" />
+#. unparsed line             <combo key="bridge" values="yes,viaduct,swing,aqueduct" required="true" default="yes" text="Bridge" />
 #. <optional>
 #. item "Highways/Streets/Bridge" text "Name"
@@ -7713,5 +7709,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:572
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:639
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:146
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:143
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
 msgid "<different>"
@@ -9130,9 +9126,7 @@
 msgstr ""
 
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
-#: build/specialmessages.java:89
 msgid "No"
 msgstr ""
@@ -11995,5 +11989,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:489
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:512
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:514
 msgid "Please select an entry."
 msgstr "Παρακαλώ επιλέξτε μια επιλογή"
@@ -12411,38 +12405,38 @@
 msgstr "Προεπιλογές Ετικετών"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:266
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:270
 msgid "Actions"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:396
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:418
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:400
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:422
 msgid "Separator"
 msgstr "Διαχωριστική γραμμή"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:580
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:584
 msgid "Toolbar"
 msgstr "Γραμμή Εργαλείων"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:584
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:588
 msgid "Available"
 msgstr "Διαθέσιμο"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:623
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:627
 msgid "Action parameters"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:624
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:628
 msgid "Parameter name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:625
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:629
 msgid "Parameter value"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:630
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:634
 msgid "Toolbar customization"
 msgstr "Προσαρμογή Γραμμής εργαλείων"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:631
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:635
 msgid "Customize the elements on the toolbar."
 msgstr "Προσαρμογή των στοιχείων της γραμμής εργαλείων."
@@ -12748,5 +12742,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:384
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:381
 #, java-format
 msgid ""
@@ -12755,49 +12749,49 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:514
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:511
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:314
 msgid "More information about this feature"
 msgstr "Περισότερες πληροφορίες για αυτό το χαρακτηριστικό"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:551
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:548
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:605
+msgid "Available roles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:606
+msgid "role"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607
+msgid "count"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:608
-msgid "Available roles"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:609
-msgid "role"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:610
-msgid "count"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:611
 msgid "elements"
 msgstr ""
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:626
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:623
 msgid "Optional Attributes:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:724
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:721
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Άγνωστος τύπος: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:792
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:789
 msgid "Preset role element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:800
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:797
 msgid "Preset sub element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:833
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:830
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -12807,15 +12801,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:843
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:840
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Σφάλμα ανάλυσης {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:884
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:881
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Υποστηρίζονται στοιχεία τύπου {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:980
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:977
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -12825,22 +12819,22 @@
 msgstr[1] "Αλλαγή {0} αντικειμένων"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:983
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:980
 msgid "Nothing selected!"
 msgstr "Τίποτα επιλεγμένο!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:985
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:982
 msgid "Selection unsuitable!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:995
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:992
 msgid "Apply Preset"
 msgstr "Εφαρμογή Προεπιλογής"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
 msgid "New relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1083
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1080
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -12869,9 +12863,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:273
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:278
 msgid "Show only applicable to selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:295
 msgid "Search in tags"
 msgstr ""
@@ -18034,4 +18028,15 @@
 msgstr ""
 
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:40
+#, fuzzy
+msgid "Seamap Editor"
+msgstr "Διαχωριστική γραμμή"
+
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#, fuzzy
+msgid "Seanap Editor"
+msgstr "Διαχωριστική γραμμή"
+
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:38
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
@@ -20014,5 +20019,5 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:90
 #, java-format
 msgid "{0} {1}% of GPS track"
@@ -20302,6 +20307,7 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88
-msgid "Get Capabilities"
-msgstr ""
+#, fuzzy
+msgid "Get Layers"
+msgstr "Επίπεδα"
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124
@@ -20313,10 +20319,7 @@
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:126
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:161
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:236
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:254
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:273
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:277
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:310
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:222
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:244
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:262
 msgid "WMS Error"
 msgstr ""
@@ -20336,17 +20339,14 @@
 msgstr "WMS URL"
 
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:235
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:221
+msgid "Could not parse WMS layer list."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:243
 msgid "Invalid service URL."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:253
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:261
 msgid "Could not retrieve WMS layer list."
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:272
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:276
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:280
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:309
-msgid "Could not parse WMS layer list."
 msgstr ""
 
@@ -22721,7 +22721,6 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. axleload (tonnes)"
 #: build/trans_presets.java:416
-#, fuzzy
 msgid "Max. axleload (tonnes)"
-msgstr "Μεγ. βάρος (τόνοι)"
+msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
@@ -25574,7 +25573,6 @@
 
 #: build/trans_presets.java:1506
-#, fuzzy
 msgid "used"
-msgstr "χρήση"
+msgstr ""
 
 #: build/trans_presets.java:1508 build/trans_presets.java:1509
@@ -26198,7 +26196,6 @@
 
 #: build/trans_presets.java:1828
-#, fuzzy
 msgid "interval"
-msgstr "βιομηχανική"
+msgstr ""
 
 #. item "Travel/Accomodation/Caravan Site" check "Power supply"
@@ -26209,7 +26206,6 @@
 #. item "Travel/Accomodation/Caravan Site" check "Tents allowed"
 #: build/trans_presets.java:1830
-#, fuzzy
 msgid "Tents allowed"
-msgstr "Επιτρέπονται μόνο δύο κόμβοι"
+msgstr ""
 
 #. item "Travel/Accomodation/Camping Site"
@@ -28780,13 +28776,11 @@
 #. item "Man Made/Mineshaft" label "Edit Mineshaft"
 #: build/trans_presets.java:2722
-#, fuzzy
 msgid "Edit Mineshaft"
-msgstr "Επεξεργασία Κινηματογράφου"
+msgstr ""
 
 #. item "Man Made/Mineshaft" text "Depth in meters"
 #: build/trans_presets.java:2725
-#, fuzzy
 msgid "Depth in meters"
-msgstr "Πλάτος (μέτρα)"
+msgstr ""
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
@@ -29052,7 +29046,6 @@
 #. item "Amenities/Clock"
 #: build/trans_presets.java:2825
-#, fuzzy
 msgid "Clock"
-msgstr "Κλειδαριά"
+msgstr ""
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=clock"
@@ -29060,7 +29053,6 @@
 #. item "Amenities/Clock" label "Edit Clock"
 #: build/trans_presets.java:2828
-#, fuzzy
 msgid "Edit Clock"
-msgstr "Επεξεργασία Hockey"
+msgstr ""
 
 #. <key key="amenity" value="clock" />
@@ -29068,33 +29060,27 @@
 #. item "Amenities/Clock" combo "Display"
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "Display"
-msgstr "νησίδα"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "analog"
-msgstr "Κανάλι"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "digital"
-msgstr "Επεξεργασία σιδηροτροχιάς"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "sundial"
-msgstr "ινδική"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "unorthodox"
-msgstr "ορθόδοξο"
+msgstr ""
 
 #. item "Amenities/Clock" combo "Support"
 #: build/trans_presets.java:2832
-#, fuzzy
 msgid "Support"
-msgstr "Άθλημα"
+msgstr ""
 
 #: build/trans_presets.java:2832
@@ -29125,7 +29111,6 @@
 #. item "Amenities/Clock" check "Shows current date"
 #: build/trans_presets.java:2834
-#, fuzzy
 msgid "Shows current date"
-msgstr "Αποθήκευση τρεχόντων δεδομένων."
+msgstr ""
 
 #. item "Amenities/Clock" check "Shows temperature"
@@ -35206,4 +35191,11 @@
 msgstr ""
 
+#.
+#. only for France
+#. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html
+#: build/trans_wms.java:52
+msgid "SPOTMaps (France)"
+msgstr ""
+
 #~ msgid ""
 #~ "The plugin could not be removed. Please tell the people you got JOSM from "
Index: /applications/editors/josm/i18n/po/en_AU.po
===================================================================
--- /applications/editors/josm/i18n/po/en_AU.po	(revision 23466)
+++ /applications/editors/josm/i18n/po/en_AU.po	(revision 23467)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-01 19:14+0200\n"
+"POT-Creation-Date: 2010-10-03 22:45+0200\n"
 "PO-Revision-Date: 2010-06-15 17:47+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-10-01 16:23+0000\n"
+"X-Launchpad-Export-Date: 2010-10-03 20:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -85,5 +85,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:251
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:515
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:186
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121
@@ -228,5 +228,4 @@
 
 #. Strings in JFileChooser
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
@@ -277,7 +276,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:995
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:992
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119
@@ -302,5 +301,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
-#: build/specialmessages.java:33 build/specialmessages.java:90
+#: build/specialmessages.java:33
 msgid "Cancel"
 msgstr "Cancel"
@@ -422,5 +421,5 @@
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:42
-#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:40
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -677,5 +676,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:145
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:509
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
@@ -1572,6 +1571,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:112
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:834
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:844
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:831
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:841
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:64
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:78
@@ -1635,5 +1634,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
-#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1327
+#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1340
 #: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1406
 #: build/specialmessages.java:65
@@ -1748,5 +1747,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
-#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1300
+#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1313
 #: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1382
 msgid "Close"
@@ -1799,5 +1798,4 @@
 msgstr "Please select at least one way to simplify."
 
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
@@ -1805,5 +1803,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:87
-#: build/specialmessages.java:88
 msgid "Yes"
 msgstr "Yes"
@@ -2535,5 +2532,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:783
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:108
@@ -2962,41 +2959,41 @@
 msgstr "Key cannot be empty when tag operator is used. Sample use: key=value"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:459
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:449
 #, java-format
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
 msgstr "Unknown primitive type: {0}. Allowed values are node, way or relation"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:641
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:631
 #, java-format
 msgid "Unexpected token. Expected {0}, found {1}"
 msgstr "Unexpected token. Expected {0}, found {1}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:656
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:646
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr "Unexpected token: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:667
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:657
 msgid "Missing parameter for OR"
 msgstr "Missing parameter for OR"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:692
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:682
 msgid "Missing operator for NOT"
 msgstr "Missing operator for NOT"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:699
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:689
 msgid "Primitive id expected"
 msgstr "Primitive id expected"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:701
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:704
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:691
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:694
 msgid "Range of numbers expected"
 msgstr "Range of numbers expected"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:707
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:697
 msgid "Changeset id expected"
 msgstr "Changeset id expected"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:709
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:699
 msgid "Version expected"
 msgstr "Version expected"
@@ -3059,5 +3056,4 @@
 
 #. Strings in JFileChooser
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
@@ -3088,5 +3084,5 @@
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:686
-#: build/specialmessages.java:58 build/specialmessages.java:87
+#: build/specialmessages.java:58
 msgid "OK"
 msgstr "OK"
@@ -3709,5 +3705,5 @@
 msgstr "E"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:243
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:258
 #, java-format
 msgid ""
@@ -3716,5 +3712,5 @@
 "Unable to add primitive {0} to the dataset because it is already included"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:651
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:666
 #, java-format
 msgid ""
@@ -4576,5 +4572,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
 msgid "Presets"
@@ -6587,5 +6583,5 @@
 #. item "Highways/Streets/Roundabout" text "Name"
 #. <space />
-#. <key key="bridge" value="yes" />
+#. unparsed line             <combo key="bridge" values="yes,viaduct,swing,aqueduct" required="true" default="yes" text="Bridge" />
 #. <optional>
 #. item "Highways/Streets/Bridge" text "Name"
@@ -7913,5 +7909,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:572
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:639
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:146
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:143
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
 msgid "<different>"
@@ -9418,9 +9414,7 @@
 msgstr "Select filename"
 
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
-#: build/specialmessages.java:89
 msgid "No"
 msgstr "No"
@@ -12472,5 +12466,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:489
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:512
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:514
 msgid "Please select an entry."
 msgstr "Please select an entry."
@@ -12916,38 +12910,38 @@
 msgstr "Tagging Presets"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:266
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:270
 msgid "Actions"
 msgstr "Actions"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:396
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:418
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:400
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:422
 msgid "Separator"
 msgstr "Separator"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:580
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:584
 msgid "Toolbar"
 msgstr "Toolbar"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:584
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:588
 msgid "Available"
 msgstr "Available"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:623
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:627
 msgid "Action parameters"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:624
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:628
 msgid "Parameter name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:625
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:629
 msgid "Parameter value"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:630
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:634
 msgid "Toolbar customization"
 msgstr "Toolbar customisation"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:631
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:635
 msgid "Customize the elements on the toolbar."
 msgstr "Customise the elements on the toolbar."
@@ -13287,5 +13281,5 @@
 msgstr "Add a new tag"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:384
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:381
 #, java-format
 msgid ""
@@ -13296,49 +13290,49 @@
 "be the same as in values"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:514
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:511
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:314
 msgid "More information about this feature"
 msgstr "More information about this feature"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:551
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:548
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:605
+msgid "Available roles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:606
+msgid "role"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607
+msgid "count"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:608
-msgid "Available roles"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:609
-msgid "role"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:610
-msgid "count"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:611
 msgid "elements"
 msgstr ""
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:626
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:623
 msgid "Optional Attributes:"
 msgstr "Optional Attributes:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:724
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:721
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Unknown type: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:792
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:789
 msgid "Preset role element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:800
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:797
 msgid "Preset sub element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:833
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:830
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -13348,15 +13342,15 @@
 msgstr "Could not read tagging preset source: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:843
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:840
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Error parsing {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:884
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:881
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Elements of type {0} are supported."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:980
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:977
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -13366,22 +13360,22 @@
 msgstr[1] "Change {0} objects"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:983
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:980
 msgid "Nothing selected!"
 msgstr "Nothing selected!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:985
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:982
 msgid "Selection unsuitable!"
 msgstr "Selection unsuitable!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:995
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:992
 msgid "Apply Preset"
 msgstr "Apply Preset"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
 msgid "New relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1083
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1080
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -13410,9 +13404,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:273
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:278
 msgid "Show only applicable to selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:295
 msgid "Search in tags"
 msgstr ""
@@ -18568,7 +18562,6 @@
 
 #: ../plugins/rgisopen/src/rgisopen/RGISLayerFromFileAction.java:34
-#, fuzzy
 msgid "New picture layer from RGIS..."
-msgstr "New picture layer from file..."
+msgstr ""
 
 #: ../plugins/rgisopen/src/rgisopen/RGISOpenPlugin.java:33
@@ -18810,4 +18803,15 @@
 msgstr "Fade background: "
 
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:40
+#, fuzzy
+msgid "Seamap Editor"
+msgstr "Separator"
+
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#, fuzzy
+msgid "Seanap Editor"
+msgstr "Separator"
+
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:38
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
@@ -20804,5 +20808,5 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:90
 #, java-format
 msgid "{0} {1}% of GPS track"
@@ -21104,6 +21108,7 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88
-msgid "Get Capabilities"
-msgstr ""
+#, fuzzy
+msgid "Get Layers"
+msgstr "Layers"
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124
@@ -21115,10 +21120,7 @@
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:126
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:161
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:236
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:254
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:273
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:277
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:310
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:222
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:244
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:262
 msgid "WMS Error"
 msgstr ""
@@ -21138,17 +21140,14 @@
 msgstr "WMS URL"
 
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:235
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:221
+msgid "Could not parse WMS layer list."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:243
 msgid "Invalid service URL."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:253
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:261
 msgid "Could not retrieve WMS layer list."
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:272
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:276
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:280
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:309
-msgid "Could not parse WMS layer list."
 msgstr ""
 
@@ -23579,7 +23578,6 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. axleload (tonnes)"
 #: build/trans_presets.java:416
-#, fuzzy
 msgid "Max. axleload (tonnes)"
-msgstr "Max. weight (tonnes)"
+msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
@@ -26432,7 +26430,6 @@
 
 #: build/trans_presets.java:1506
-#, fuzzy
 msgid "used"
-msgstr "unused"
+msgstr ""
 
 #: build/trans_presets.java:1508 build/trans_presets.java:1509
@@ -26441,7 +26438,6 @@
 
 #: build/trans_presets.java:1508 build/trans_presets.java:1509
-#, fuzzy
 msgid "oldtimer"
-msgstr "folder"
+msgstr ""
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Parts"
@@ -27053,12 +27049,10 @@
 #. item "Travel/Accomodation/Caravan Site" combo "Requires a fee"
 #: build/trans_presets.java:1828
-#, fuzzy
 msgid "Requires a fee"
-msgstr "Request Failed"
+msgstr ""
 
 #: build/trans_presets.java:1828
-#, fuzzy
 msgid "interval"
-msgstr "industrial"
+msgstr ""
 
 #. item "Travel/Accomodation/Caravan Site" check "Power supply"
@@ -27069,7 +27063,6 @@
 #. item "Travel/Accomodation/Caravan Site" check "Tents allowed"
 #: build/trans_presets.java:1830
-#, fuzzy
 msgid "Tents allowed"
-msgstr "Test failed"
+msgstr ""
 
 #. item "Travel/Accomodation/Camping Site"
@@ -29640,13 +29633,11 @@
 #. item "Man Made/Mineshaft" label "Edit Mineshaft"
 #: build/trans_presets.java:2722
-#, fuzzy
 msgid "Edit Mineshaft"
-msgstr "Edit Marina"
+msgstr ""
 
 #. item "Man Made/Mineshaft" text "Depth in meters"
 #: build/trans_presets.java:2725
-#, fuzzy
 msgid "Depth in meters"
-msgstr "Width (metres)"
+msgstr ""
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
@@ -29912,7 +29903,6 @@
 #. item "Amenities/Clock"
 #: build/trans_presets.java:2825
-#, fuzzy
 msgid "Clock"
-msgstr "Block"
+msgstr ""
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=clock"
@@ -29920,7 +29910,6 @@
 #. item "Amenities/Clock" label "Edit Clock"
 #: build/trans_presets.java:2828
-#, fuzzy
 msgid "Edit Clock"
-msgstr "Edit Dock"
+msgstr ""
 
 #. <key key="amenity" value="clock" />
@@ -29928,33 +29917,27 @@
 #. item "Amenities/Clock" combo "Display"
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "Display"
-msgstr "island"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "analog"
-msgstr "Canal"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "digital"
-msgstr "Edit Railway"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "sundial"
-msgstr "sunni"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "unorthodox"
-msgstr "orthodox"
+msgstr ""
 
 #. item "Amenities/Clock" combo "Support"
 #: build/trans_presets.java:2832
-#, fuzzy
 msgid "Support"
-msgstr "Sport"
+msgstr ""
 
 #: build/trans_presets.java:2832
@@ -29963,18 +29946,15 @@
 
 #: build/trans_presets.java:2832
-#, fuzzy
 msgid "billboard"
-msgstr "Bollard"
+msgstr ""
 
 #. item "Amenities/Clock" combo "Visibility/readability"
 #: build/trans_presets.java:2833
-#, fuzzy
 msgid "Visibility/readability"
-msgstr "Visibility"
+msgstr ""
 
 #: build/trans_presets.java:2833
-#, fuzzy
 msgid "(up to 5m)"
-msgstr "up to tile"
+msgstr ""
 
 #: build/trans_presets.java:2833
@@ -29988,7 +29968,6 @@
 #. item "Amenities/Clock" check "Shows current date"
 #: build/trans_presets.java:2834
-#, fuzzy
 msgid "Shows current date"
-msgstr "Save the current data."
+msgstr ""
 
 #. item "Amenities/Clock" check "Shows temperature"
@@ -30004,7 +29983,6 @@
 #. item "Amenities/Clock" check "Shows humidity"
 #: build/trans_presets.java:2837
-#, fuzzy
 msgid "Shows humidity"
-msgstr "Show history"
+msgstr ""
 
 #. </optional>
@@ -36070,4 +36048,11 @@
 msgstr ""
 
+#.
+#. only for France
+#. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html
+#: build/trans_wms.java:52
+msgid "SPOTMaps (France)"
+msgstr ""
+
 #~ msgid "Enter values for all conflicts."
 #~ msgstr "Enter values for all conflicts."
Index: /applications/editors/josm/i18n/po/en_GB.po
===================================================================
--- /applications/editors/josm/i18n/po/en_GB.po	(revision 23466)
+++ /applications/editors/josm/i18n/po/en_GB.po	(revision 23467)
@@ -11,6 +11,6 @@
 "Project-Id-Version: JOSM\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-01 19:14+0200\n"
-"PO-Revision-Date: 2010-09-02 22:13+0000\n"
+"POT-Creation-Date: 2010-10-03 22:45+0200\n"
+"PO-Revision-Date: 2010-10-01 20:59+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: German <josm-dev@openstreetmap.org>\n"
@@ -19,5 +19,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-10-01 16:24+0000\n"
+"X-Launchpad-Export-Date: 2010-10-03 20:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -88,5 +88,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:251
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:515
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:186
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121
@@ -231,5 +231,4 @@
 
 #. Strings in JFileChooser
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
@@ -280,7 +279,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:995
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:992
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119
@@ -305,5 +304,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
-#: build/specialmessages.java:33 build/specialmessages.java:90
+#: build/specialmessages.java:33
 msgid "Cancel"
 msgstr "Cancel"
@@ -425,5 +424,5 @@
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:42
-#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:40
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -680,5 +679,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:145
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:509
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
@@ -1575,6 +1574,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:112
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:834
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:844
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:831
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:841
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:64
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:78
@@ -1638,5 +1637,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
-#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1327
+#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1340
 #: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1406
 #: build/specialmessages.java:65
@@ -1751,5 +1750,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
-#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1300
+#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1313
 #: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1382
 msgid "Close"
@@ -1802,5 +1801,4 @@
 msgstr "Please select at least one way to simplify."
 
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
@@ -1808,5 +1806,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:87
-#: build/specialmessages.java:88
 msgid "Yes"
 msgstr "Yes"
@@ -2538,5 +2535,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:783
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:108
@@ -2965,41 +2962,41 @@
 msgstr "Key cannot be empty when tag operator is used. Sample use: key=value"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:459
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:449
 #, java-format
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
 msgstr "Unknown primitive type: {0}. Allowed values are node, way or relation"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:641
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:631
 #, java-format
 msgid "Unexpected token. Expected {0}, found {1}"
 msgstr "Unexpected token. Expected {0}, found {1}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:656
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:646
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr "Unexpected token: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:667
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:657
 msgid "Missing parameter for OR"
 msgstr "Missing parameter for OR"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:692
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:682
 msgid "Missing operator for NOT"
 msgstr "Missing operator for NOT"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:699
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:689
 msgid "Primitive id expected"
 msgstr "Primitive id expected"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:701
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:704
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:691
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:694
 msgid "Range of numbers expected"
 msgstr "Range of numbers expected"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:707
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:697
 msgid "Changeset id expected"
 msgstr "Changeset id expected"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:709
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:699
 msgid "Version expected"
 msgstr "Version expected"
@@ -3062,5 +3059,4 @@
 
 #. Strings in JFileChooser
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
@@ -3091,5 +3087,5 @@
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:686
-#: build/specialmessages.java:58 build/specialmessages.java:87
+#: build/specialmessages.java:58
 msgid "OK"
 msgstr "OK"
@@ -3712,5 +3708,5 @@
 msgstr "E"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:243
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:258
 #, java-format
 msgid ""
@@ -3719,5 +3715,5 @@
 "Unable to add primitive {0} to the dataset because it is already included"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:651
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:666
 #, java-format
 msgid ""
@@ -4579,5 +4575,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
 msgid "Presets"
@@ -6590,5 +6586,5 @@
 #. item "Highways/Streets/Roundabout" text "Name"
 #. <space />
-#. <key key="bridge" value="yes" />
+#. unparsed line             <combo key="bridge" values="yes,viaduct,swing,aqueduct" required="true" default="yes" text="Bridge" />
 #. <optional>
 #. item "Highways/Streets/Bridge" text "Name"
@@ -7924,5 +7920,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:572
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:639
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:146
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:143
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
 msgid "<different>"
@@ -9429,9 +9425,7 @@
 msgstr "Select filename"
 
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
-#: build/specialmessages.java:89
 msgid "No"
 msgstr "No"
@@ -12485,5 +12479,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:489
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:512
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:514
 msgid "Please select an entry."
 msgstr "Please select an entry."
@@ -12929,38 +12923,38 @@
 msgstr "Tagging Presets"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:266
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:270
 msgid "Actions"
 msgstr "Actions"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:396
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:418
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:400
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:422
 msgid "Separator"
 msgstr "Separator"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:580
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:584
 msgid "Toolbar"
 msgstr "Toolbar"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:584
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:588
 msgid "Available"
 msgstr "Available"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:623
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:627
 msgid "Action parameters"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:624
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:628
 msgid "Parameter name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:625
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:629
 msgid "Parameter value"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:630
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:634
 msgid "Toolbar customization"
 msgstr "Toolbar customisation"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:631
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:635
 msgid "Customize the elements on the toolbar."
 msgstr "Customise the elements on the toolbar."
@@ -13300,5 +13294,5 @@
 msgstr "Add a new tag"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:384
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:381
 #, java-format
 msgid ""
@@ -13309,49 +13303,49 @@
 "be the same as in values"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:514
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:511
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:314
 msgid "More information about this feature"
 msgstr "More information about this feature"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:551
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:548
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:605
+msgid "Available roles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:606
+msgid "role"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607
+msgid "count"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:608
-msgid "Available roles"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:609
-msgid "role"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:610
-msgid "count"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:611
 msgid "elements"
 msgstr ""
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:626
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:623
 msgid "Optional Attributes:"
 msgstr "Optional Attributes:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:724
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:721
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Unknown type: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:792
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:789
 msgid "Preset role element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:800
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:797
 msgid "Preset sub element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:833
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:830
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -13361,15 +13355,15 @@
 msgstr "Could not read tagging preset source: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:843
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:840
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Error parsing {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:884
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:881
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Elements of type {0} are supported."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:980
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:977
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -13379,22 +13373,22 @@
 msgstr[1] "Change {0} objects"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:983
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:980
 msgid "Nothing selected!"
 msgstr "Nothing selected!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:985
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:982
 msgid "Selection unsuitable!"
 msgstr "Selection unsuitable!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:995
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:992
 msgid "Apply Preset"
 msgstr "Apply Preset"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
 msgid "New relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1083
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1080
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -13423,9 +13417,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:273
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:278
 msgid "Show only applicable to selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:295
 msgid "Search in tags"
 msgstr ""
@@ -18591,7 +18585,6 @@
 
 #: ../plugins/rgisopen/src/rgisopen/RGISLayerFromFileAction.java:34
-#, fuzzy
 msgid "New picture layer from RGIS..."
-msgstr "New picture layer from file..."
+msgstr ""
 
 #: ../plugins/rgisopen/src/rgisopen/RGISOpenPlugin.java:33
@@ -18832,4 +18825,15 @@
 msgid "Fade background: "
 msgstr "Fade background: "
+
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:40
+#, fuzzy
+msgid "Seamap Editor"
+msgstr "Separator"
+
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#, fuzzy
+msgid "Seanap Editor"
+msgstr "Separator"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:38
@@ -20847,5 +20851,5 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:90
 #, java-format
 msgid "{0} {1}% of GPS track"
@@ -21147,6 +21151,7 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88
-msgid "Get Capabilities"
-msgstr ""
+#, fuzzy
+msgid "Get Layers"
+msgstr "Layers"
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124
@@ -21158,10 +21163,7 @@
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:126
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:161
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:236
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:254
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:273
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:277
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:310
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:222
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:244
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:262
 msgid "WMS Error"
 msgstr ""
@@ -21181,17 +21183,14 @@
 msgstr "WMS URL"
 
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:235
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:221
+msgid "Could not parse WMS layer list."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:243
 msgid "Invalid service URL."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:253
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:261
 msgid "Could not retrieve WMS layer list."
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:272
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:276
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:280
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:309
-msgid "Could not parse WMS layer list."
 msgstr ""
 
@@ -23624,7 +23623,6 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. axleload (tonnes)"
 #: build/trans_presets.java:416
-#, fuzzy
 msgid "Max. axleload (tonnes)"
-msgstr "Max. weight (tonnes)"
+msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
@@ -26477,7 +26475,6 @@
 
 #: build/trans_presets.java:1506
-#, fuzzy
 msgid "used"
-msgstr "unused"
+msgstr ""
 
 #: build/trans_presets.java:1508 build/trans_presets.java:1509
@@ -26486,7 +26483,6 @@
 
 #: build/trans_presets.java:1508 build/trans_presets.java:1509
-#, fuzzy
 msgid "oldtimer"
-msgstr "folder"
+msgstr ""
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Parts"
@@ -27098,12 +27094,10 @@
 #. item "Travel/Accomodation/Caravan Site" combo "Requires a fee"
 #: build/trans_presets.java:1828
-#, fuzzy
 msgid "Requires a fee"
-msgstr "Request Failed"
+msgstr ""
 
 #: build/trans_presets.java:1828
-#, fuzzy
 msgid "interval"
-msgstr "industrial"
+msgstr ""
 
 #. item "Travel/Accomodation/Caravan Site" check "Power supply"
@@ -27114,7 +27108,6 @@
 #. item "Travel/Accomodation/Caravan Site" check "Tents allowed"
 #: build/trans_presets.java:1830
-#, fuzzy
 msgid "Tents allowed"
-msgstr "Test failed"
+msgstr ""
 
 #. item "Travel/Accomodation/Camping Site"
@@ -29685,13 +29678,11 @@
 #. item "Man Made/Mineshaft" label "Edit Mineshaft"
 #: build/trans_presets.java:2722
-#, fuzzy
 msgid "Edit Mineshaft"
-msgstr "Edit Marina"
+msgstr ""
 
 #. item "Man Made/Mineshaft" text "Depth in meters"
 #: build/trans_presets.java:2725
-#, fuzzy
 msgid "Depth in meters"
-msgstr "Width (metres)"
+msgstr ""
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
@@ -29957,7 +29948,6 @@
 #. item "Amenities/Clock"
 #: build/trans_presets.java:2825
-#, fuzzy
 msgid "Clock"
-msgstr "Block"
+msgstr ""
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=clock"
@@ -29965,7 +29955,6 @@
 #. item "Amenities/Clock" label "Edit Clock"
 #: build/trans_presets.java:2828
-#, fuzzy
 msgid "Edit Clock"
-msgstr "Edit Dock"
+msgstr ""
 
 #. <key key="amenity" value="clock" />
@@ -29973,33 +29962,27 @@
 #. item "Amenities/Clock" combo "Display"
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "Display"
-msgstr "island"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "analog"
-msgstr "Canal"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "digital"
-msgstr "Edit Railway"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "sundial"
-msgstr "sunni"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "unorthodox"
-msgstr "orthodox"
+msgstr ""
 
 #. item "Amenities/Clock" combo "Support"
 #: build/trans_presets.java:2832
-#, fuzzy
 msgid "Support"
-msgstr "Sport"
+msgstr ""
 
 #: build/trans_presets.java:2832
@@ -30008,18 +29991,15 @@
 
 #: build/trans_presets.java:2832
-#, fuzzy
 msgid "billboard"
-msgstr "Bollard"
+msgstr ""
 
 #. item "Amenities/Clock" combo "Visibility/readability"
 #: build/trans_presets.java:2833
-#, fuzzy
 msgid "Visibility/readability"
-msgstr "Visibility"
+msgstr ""
 
 #: build/trans_presets.java:2833
-#, fuzzy
 msgid "(up to 5m)"
-msgstr "up to tile"
+msgstr ""
 
 #: build/trans_presets.java:2833
@@ -30033,7 +30013,6 @@
 #. item "Amenities/Clock" check "Shows current date"
 #: build/trans_presets.java:2834
-#, fuzzy
 msgid "Shows current date"
-msgstr "Save the current data."
+msgstr ""
 
 #. item "Amenities/Clock" check "Shows temperature"
@@ -30049,7 +30028,6 @@
 #. item "Amenities/Clock" check "Shows humidity"
 #: build/trans_presets.java:2837
-#, fuzzy
 msgid "Shows humidity"
-msgstr "Show history"
+msgstr ""
 
 #. </optional>
@@ -36113,4 +36091,11 @@
 #: build/trans_wms.java:49
 msgid "PCN 2006 - Italy"
+msgstr ""
+
+#.
+#. only for France
+#. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html
+#: build/trans_wms.java:52
+msgid "SPOTMaps (France)"
 msgstr ""
 
Index: /applications/editors/josm/i18n/po/es.po
===================================================================
--- /applications/editors/josm/i18n/po/es.po	(revision 23466)
+++ /applications/editors/josm/i18n/po/es.po	(revision 23467)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-01 19:14+0200\n"
-"PO-Revision-Date: 2010-09-30 01:28+0000\n"
-"Last-Translator: sebikul <Unknown>\n"
+"POT-Creation-Date: 2010-10-03 22:45+0200\n"
+"PO-Revision-Date: 2010-10-03 10:14+0000\n"
+"Last-Translator: Emilio Gomez Fernandez <Unknown>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-10-01 16:28+0000\n"
+"X-Launchpad-Export-Date: 2010-10-03 20:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -85,5 +85,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:251
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:515
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:186
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121
@@ -231,5 +231,4 @@
 
 #. Strings in JFileChooser
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
@@ -280,7 +279,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:995
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:992
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119
@@ -305,5 +304,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
-#: build/specialmessages.java:33 build/specialmessages.java:90
+#: build/specialmessages.java:33
 msgid "Cancel"
 msgstr "Cancelar"
@@ -424,5 +423,5 @@
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:42
-#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:40
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -679,5 +678,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:145
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:509
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
@@ -1006,9 +1005,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1069
 msgid "Split ways into fragments"
-msgstr ""
+msgstr "Dividir vías en fragmentos"
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1547
 msgid "Sorry. Cannot handle multipolygon relations with multiple outer ways."
 msgstr ""
+"Lo sentimos. No se puede manejar relaciones multipolígono con múltiples "
+"formas exteriores."
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1557
@@ -1016,4 +1017,6 @@
 "Sorry. Cannot handle way that is outer in multiple multipolygon relations."
 msgstr ""
+"Lo sentimos. No se puede manejar vías que son exteriores de relaciones "
+"multipolígono múltiples."
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1562
@@ -1023,4 +1026,6 @@
 "relations."
 msgstr ""
+"Lo sentimos. No se puede manejar vías que son a la vez interiores y "
+"exteriores de relaciones multipolígono."
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1574
@@ -1028,4 +1033,6 @@
 "Sorry. Cannot handle way that is inner in multiple multipolygon relations."
 msgstr ""
+"Lo sentimos. No se puede manejar vías que son interiores de relaciones de "
+"multipolígono múltiples."
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1681
@@ -1602,6 +1609,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:112
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:834
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:844
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:831
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:841
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:64
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:78
@@ -1665,5 +1672,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
-#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1327
+#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1340
 #: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1406
 #: build/specialmessages.java:65
@@ -1779,5 +1786,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
-#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1300
+#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1313
 #: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1382
 msgid "Close"
@@ -1830,5 +1837,4 @@
 msgstr "Por favor, seleccione al menos una para simplificar."
 
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
@@ -1836,5 +1842,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:87
-#: build/specialmessages.java:88
 msgid "Yes"
 msgstr "Si"
@@ -2584,5 +2589,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:783
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:108
@@ -3031,5 +3036,5 @@
 "de uso: clave=valor"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:459
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:449
 #, java-format
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
@@ -3038,36 +3043,36 @@
 "relación"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:641
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:631
 #, java-format
 msgid "Unexpected token. Expected {0}, found {1}"
 msgstr "Elemento no esperado. Se esperaba {0} pero se encontró {1}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:656
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:646
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr "Credencial de autentificación inexperada: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:667
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:657
 msgid "Missing parameter for OR"
 msgstr "Falta un parámetro para el 'OR'"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:692
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:682
 msgid "Missing operator for NOT"
 msgstr "Falta un para para el 'NOT'"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:699
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:689
 msgid "Primitive id expected"
 msgstr "Se esparaba la primitiva id."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:701
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:704
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:691
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:694
 msgid "Range of numbers expected"
 msgstr "Se esperaba un rango de números"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:707
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:697
 msgid "Changeset id expected"
 msgstr "Se esperaba un conjunto de cambios"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:709
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:699
 msgid "Version expected"
 msgstr "Se esperaba una versión"
@@ -3131,5 +3136,4 @@
 
 #. Strings in JFileChooser
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
@@ -3160,5 +3164,5 @@
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:686
-#: build/specialmessages.java:58 build/specialmessages.java:87
+#: build/specialmessages.java:58
 msgid "OK"
 msgstr "Aceptar"
@@ -3791,5 +3795,5 @@
 msgstr "E"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:243
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:258
 #, java-format
 msgid ""
@@ -3799,5 +3803,5 @@
 "incluida"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:651
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:666
 #, java-format
 msgid ""
@@ -4677,5 +4681,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
 msgid "Presets"
@@ -6748,5 +6752,5 @@
 #. item "Highways/Streets/Roundabout" text "Name"
 #. <space />
-#. <key key="bridge" value="yes" />
+#. unparsed line             <combo key="bridge" values="yes,viaduct,swing,aqueduct" required="true" default="yes" text="Bridge" />
 #. <optional>
 #. item "Highways/Streets/Bridge" text "Name"
@@ -8096,5 +8100,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:572
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:639
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:146
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:143
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
 msgid "<different>"
@@ -8191,9 +8195,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1054
 msgid "Go to OSM wiki for tag help (F1)"
-msgstr ""
+msgstr "Ir a la wiki de OSM mostrar la ayuda de etiqueta (F1)"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055
 msgid "Launch browser with wiki help to selected object"
-msgstr ""
+msgstr "Abrir el navegador con la para wiki de ayuda del objeto seleccionado"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1145
@@ -9648,9 +9652,7 @@
 msgstr "Seleccione nombre de fichero"
 
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
-#: build/specialmessages.java:89
 msgid "No"
 msgstr "No"
@@ -12081,9 +12083,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260
 msgid "Change a key/value pair"
-msgstr ""
+msgstr "Cambiar el par de clave/valor"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:278
 msgid "Values"
-msgstr ""
+msgstr "Valores"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
@@ -12792,5 +12794,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:489
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:512
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:514
 msgid "Please select an entry."
 msgstr "Por favor seleccione una entrada."
@@ -13188,5 +13190,5 @@
 #, java-format
 msgid "Warning: Could not read tagging preset source: {0}"
-msgstr ""
+msgstr "Advertencia: No se pudo leer la fuente de etiquetado predefinido: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63
@@ -13254,38 +13256,38 @@
 msgstr "Etiquetas preestablecidas"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:266
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:270
 msgid "Actions"
 msgstr "Acciones"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:396
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:418
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:400
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:422
 msgid "Separator"
 msgstr "Separador"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:580
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:584
 msgid "Toolbar"
 msgstr "Barra de herramientas"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:584
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:588
 msgid "Available"
 msgstr "Disponible"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:623
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:627
 msgid "Action parameters"
 msgstr "Paramétros de Acciones"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:624
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:628
 msgid "Parameter name"
 msgstr "Nombre del parámetro"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:625
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:629
 msgid "Parameter value"
 msgstr "Valor del parámetro"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:630
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:634
 msgid "Toolbar customization"
 msgstr "Personalización de la barra de herramientas"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:631
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:635
 msgid "Customize the elements on the toolbar."
 msgstr "Personalización de los elementos de la barra de herramientas"
@@ -13637,5 +13639,5 @@
 msgstr "Añadir una nueva etiqueta"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:384
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:381
 #, java-format
 msgid ""
@@ -13646,49 +13648,49 @@
 "display_values debe ser el mismo presente en values"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:514
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:511
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:314
 msgid "More information about this feature"
 msgstr "Más información sobre esta característica"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:551
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:548
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr "Requisito desconocido: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:608
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:605
 msgid "Available roles"
 msgstr "Roles disponibles"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:609
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:606
 msgid "role"
 msgstr "rol"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:610
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607
 msgid "count"
 msgstr "conteo"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:611
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:608
 msgid "elements"
 msgstr "elementos"
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:626
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:623
 msgid "Optional Attributes:"
 msgstr "Atributos opcionales"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:724
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:721
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Tipo desconocido: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:792
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:789
 msgid "Preset role element without parent"
 msgstr "Rol preestablecido sin padre"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:800
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:797
 msgid "Preset sub element without parent"
 msgstr "subelmento preestablecido sin padre"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:833
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:830
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -13698,15 +13700,15 @@
 msgstr "No se pudo leer la fuente de las preferencias de etiquetas: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:843
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:840
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Error analizando {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:884
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:881
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Los elementos del tipo {0} son soportados"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:980
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:977
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -13716,22 +13718,22 @@
 msgstr[1] "Modificar objetos {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:983
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:980
 msgid "Nothing selected!"
 msgstr "¡No hay nada seleccionado!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:985
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:982
 msgid "Selection unsuitable!"
 msgstr "¡Selección inadecuada!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:995
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:992
 msgid "Apply Preset"
 msgstr "Aplicar"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
 msgid "New relation"
 msgstr "Nueva relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1083
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1080
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -13760,9 +13762,9 @@
 msgstr "Buscar predefinidos"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:273
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:278
 msgid "Show only applicable to selection"
 msgstr "La muestra sólo es aplicable a la selección"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:295
 msgid "Search in tags"
 msgstr "Buscar en etiquetas"
@@ -15343,5 +15345,5 @@
 #, java-format
 msgid "Invalid URL ''{0}'' in plugin {1}"
-msgstr ""
+msgstr "URL invalida \"{0}\" en el componente {1}"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:245
@@ -16061,17 +16063,17 @@
 #: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:314
 msgid "Layer Properties"
-msgstr ""
+msgstr "Propiedades de la capa"
 
 #: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
 msgid "Import image"
-msgstr ""
+msgstr "Importar imagen"
 
 #: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
 msgid "Import georeferenced image"
-msgstr ""
+msgstr "Importar imagen georreferenciada"
 
 #: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
 msgid "Error while creating image layer: "
-msgstr ""
+msgstr "Error mientras se creaba la capa imagen: "
 
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:67
@@ -17712,9 +17714,9 @@
 #: ../plugins/ext_tools/src/ext_tools/ExtTool.java:129
 msgid "External tool error"
-msgstr ""
+msgstr "Error de herramienta externa"
 
 #: ../plugins/ext_tools/src/ext_tools/ExtTool.java:177
 msgid "Error executing the script:"
-msgstr ""
+msgstr "Error ejecutando el script:"
 
 #: ../plugins/ext_tools/src/ext_tools/ExtTool.java:221
@@ -17724,4 +17726,7 @@
 "stderr contents:"
 msgstr ""
+"El script hijo ha retornado datos inválidos.\n"
+"\n"
+"contenidos stderr:"
 
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
@@ -19128,11 +19133,10 @@
 
 #: ../plugins/rgisopen/src/rgisopen/RGISLayerFromFileAction.java:34
-#, fuzzy
 msgid "New picture layer from RGIS..."
-msgstr "Nueva capa de imágenes desde un archivo..."
+msgstr "Nueva imagen desde RGIS..."
 
 #: ../plugins/rgisopen/src/rgisopen/RGISOpenPlugin.java:33
 msgid "RGIS"
-msgstr ""
+msgstr "RGIS"
 
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87
@@ -19369,4 +19373,15 @@
 msgid "Fade background: "
 msgstr "Fondo de pantalla apagado: "
+
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:40
+#, fuzzy
+msgid "Seamap Editor"
+msgstr "Editor de marcas marinas"
+
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#, fuzzy
+msgid "Seanap Editor"
+msgstr "Editor de marcas marinas"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:38
@@ -21482,5 +21497,5 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:90
 #, java-format
 msgid "{0} {1}% of GPS track"
@@ -21517,5 +21532,5 @@
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
 msgid "Backward"
-msgstr ""
+msgstr "Hacia atrás"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
@@ -21525,5 +21540,5 @@
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:163
 msgid "Jump To"
-msgstr ""
+msgstr "Ir a"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:163
@@ -21561,5 +21576,5 @@
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:205
 msgid "Loop"
-msgstr ""
+msgstr "Ciclo"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:205
@@ -21748,5 +21763,5 @@
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:42
 msgid "Enter search expression here.."
-msgstr ""
+msgstr "Introduzca la expresión de búsqueda aquí..."
 
 #. add label
@@ -21787,6 +21802,6 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88
-msgid "Get Capabilities"
-msgstr ""
+msgid "Get Layers"
+msgstr "Obtener capas"
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124
@@ -21800,10 +21815,7 @@
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:126
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:161
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:236
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:254
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:273
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:277
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:310
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:222
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:244
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:262
 msgid "WMS Error"
 msgstr "Error del WMS"
@@ -21823,18 +21835,15 @@
 msgstr "Dirección URL del servicio WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:235
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:221
+msgid "Could not parse WMS layer list."
+msgstr "No se pudo analizar la lista de las capas WMS."
+
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:243
 msgid "Invalid service URL."
 msgstr "URL del servicio invalida."
 
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:253
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:261
 msgid "Could not retrieve WMS layer list."
 msgstr "No se pudo recuperar la lista de las capas WMS."
-
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:272
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:276
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:280
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:309
-msgid "Could not parse WMS layer list."
-msgstr "No se pudo analizar la lista de las capas WMS."
 
 #: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:76
@@ -22153,5 +22162,5 @@
 msgctxt "layer"
 msgid "Zoom"
-msgstr ""
+msgstr "Zoom"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:325
@@ -22166,10 +22175,10 @@
 #, java-format
 msgid "EULA license URL not available: {0}"
-msgstr ""
+msgstr "URL de licencia EULA no disponible: {0}"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:383
 #, java-format
 msgid "Malformed URL for the EULA licence: {0}"
-msgstr ""
+msgstr "URL malformada para la licencia EULA: {0}"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSRemoteHandler.java:21
@@ -22180,5 +22189,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSRemoteHandler.java:46
 msgid "Remote WMS"
-msgstr ""
+msgstr "WMS remoto"
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -22651,5 +22660,5 @@
 #: build/trans_plugins.java:36 build/trans_plugins.java:38
 msgid "Plugin for importing spatial referenced images"
-msgstr ""
+msgstr "Componente para importar imágenes espacialmente georreferenciadas"
 
 #. Plugin irsrectify
@@ -22791,5 +22800,5 @@
 #: build/trans_plugins.java:78
 msgid "Use rgis.spb.ru image as overlay"
-msgstr ""
+msgstr "Usar imagen de rgis.spb.ru como capa"
 
 #. Plugin RoadSigns
@@ -22842,5 +22851,5 @@
 #: build/trans_plugins.java:90
 msgid "Create and edit seamaps for OpenSeaMap"
-msgstr ""
+msgstr "Crea y edita un mapa naútico para OpenSeaMap"
 
 #. Plugin surveyor
@@ -23410,7 +23419,6 @@
 #: build/trans_presets.java:588 build/trans_presets.java:611
 #: build/trans_presets.java:630 build/trans_presets.java:651
-#, fuzzy
 msgid "Lit"
-msgstr "Lista"
+msgstr "Iluminación"
 
 #. </optional>
@@ -24312,7 +24320,6 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. axleload (tonnes)"
 #: build/trans_presets.java:416
-#, fuzzy
 msgid "Max. axleload (tonnes)"
-msgstr "Peso máximo (t)"
+msgstr "Máxima carga por eje de ruedas (toneladas)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
@@ -27166,7 +27173,6 @@
 
 #: build/trans_presets.java:1506
-#, fuzzy
 msgid "used"
-msgstr "no usado"
+msgstr "usado"
 
 #: build/trans_presets.java:1508 build/trans_presets.java:1509
@@ -27175,7 +27181,6 @@
 
 #: build/trans_presets.java:1508 build/trans_presets.java:1509
-#, fuzzy
 msgid "oldtimer"
-msgstr "carpeta"
+msgstr "experimentado"
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Parts"
@@ -27783,27 +27788,24 @@
 #: build/trans_presets.java:1827
 msgid "Number of places"
-msgstr ""
+msgstr "Número de lugares"
 
 #. item "Travel/Accomodation/Caravan Site" combo "Requires a fee"
 #: build/trans_presets.java:1828
-#, fuzzy
 msgid "Requires a fee"
-msgstr "Solicitud fallida"
+msgstr "Requiere una cuota"
 
 #: build/trans_presets.java:1828
-#, fuzzy
 msgid "interval"
-msgstr "industrial"
+msgstr "intervalo"
 
 #. item "Travel/Accomodation/Caravan Site" check "Power supply"
 #: build/trans_presets.java:1829
 msgid "Power supply"
-msgstr ""
+msgstr "Fuente de alimentación"
 
 #. item "Travel/Accomodation/Caravan Site" check "Tents allowed"
 #: build/trans_presets.java:1830
-#, fuzzy
 msgid "Tents allowed"
-msgstr "Falló la prueba"
+msgstr "Permitido tiendas de campaña"
 
 #. item "Travel/Accomodation/Camping Site"
@@ -30369,18 +30371,16 @@
 #: build/trans_presets.java:2720
 msgid "Mineshaft"
-msgstr ""
+msgstr "Pozo minero"
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dmineshaft" />
 #. item "Man Made/Mineshaft" label "Edit Mineshaft"
 #: build/trans_presets.java:2722
-#, fuzzy
 msgid "Edit Mineshaft"
-msgstr "Editar puerto deportivo"
+msgstr "Editar pozo minero"
 
 #. item "Man Made/Mineshaft" text "Depth in meters"
 #: build/trans_presets.java:2725
-#, fuzzy
 msgid "Depth in meters"
-msgstr "Paramétros de Acciones"
+msgstr "Profundidad en metros"
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
@@ -30646,7 +30646,6 @@
 #. item "Amenities/Clock"
 #: build/trans_presets.java:2825
-#, fuzzy
 msgid "Clock"
-msgstr "Bloques"
+msgstr "Reloj"
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=clock"
@@ -30654,7 +30653,6 @@
 #. item "Amenities/Clock" label "Edit Clock"
 #: build/trans_presets.java:2828
-#, fuzzy
 msgid "Edit Clock"
-msgstr "Editar un muelle"
+msgstr "Editar reloj"
 
 #. <key key="amenity" value="clock" />
@@ -30662,83 +30660,72 @@
 #. item "Amenities/Clock" combo "Display"
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "Display"
-msgstr "reproducir"
+msgstr "Esfera"
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "analog"
-msgstr "Canal"
+msgstr "analógica"
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "digital"
-msgstr "Ediar vía de tren"
+msgstr "digital"
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "sundial"
-msgstr "suní"
+msgstr "reloj de sol"
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "unorthodox"
-msgstr "ortodoxo"
+msgstr "poco ortodoxo"
 
 #. item "Amenities/Clock" combo "Support"
 #: build/trans_presets.java:2832
-#, fuzzy
 msgid "Support"
-msgstr "Deporte"
+msgstr "Soporte"
 
 #: build/trans_presets.java:2832
 msgid "wall_mounted"
-msgstr ""
+msgstr "Montado en la pared"
 
 #: build/trans_presets.java:2832
-#, fuzzy
 msgid "billboard"
-msgstr "Bolardo"
+msgstr "cartelera"
 
 #. item "Amenities/Clock" combo "Visibility/readability"
 #: build/trans_presets.java:2833
-#, fuzzy
 msgid "Visibility/readability"
-msgstr "Visibilidad"
+msgstr "Visibilidad/legibilidad"
 
 #: build/trans_presets.java:2833
-#, fuzzy
 msgid "(up to 5m)"
-msgstr "hasta la tesela"
+msgstr "(hasta 5 metros)"
 
 #: build/trans_presets.java:2833
 msgid "(up to 20m)"
-msgstr ""
+msgstr "(hasta 20 metros)"
 
 #: build/trans_presets.java:2833
 msgid "(more than 20m)"
-msgstr ""
+msgstr "(más de 5 metros)"
 
 #. item "Amenities/Clock" check "Shows current date"
 #: build/trans_presets.java:2834
-#, fuzzy
 msgid "Shows current date"
-msgstr "Guardar los datos actuales."
+msgstr "Muestra la fecha actual"
 
 #. item "Amenities/Clock" check "Shows temperature"
 #: build/trans_presets.java:2835
 msgid "Shows temperature"
-msgstr ""
+msgstr "Muestra la temperatura"
 
 #. item "Amenities/Clock" check "Shows barometric pressure"
 #: build/trans_presets.java:2836
 msgid "Shows barometric pressure"
-msgstr ""
+msgstr "Muestra la presión barométrica"
 
 #. item "Amenities/Clock" check "Shows humidity"
 #: build/trans_presets.java:2837
-#, fuzzy
 msgid "Shows humidity"
-msgstr "Mostrar histórico"
+msgstr "Muestra la humedad"
 
 #. </optional>
@@ -32656,5 +32643,5 @@
 #: build/trans_presets.java:3688
 msgid "Route network"
-msgstr ""
+msgstr "Red de rutas"
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Relations/Proposed/Network"/>
@@ -32662,5 +32649,5 @@
 #: build/trans_presets.java:3690
 msgid "Edit route network"
-msgstr ""
+msgstr "Editar red rutas"
 
 #. </optional>
@@ -32669,5 +32656,5 @@
 #: build/trans_presets.java:3698
 msgid "member"
-msgstr ""
+msgstr "miembro"
 
 #. </roles>
@@ -32675,5 +32662,5 @@
 #: build/trans_presets.java:3701
 msgid "Associated street"
-msgstr ""
+msgstr "Calle asociada"
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:associatedStreet"/>
@@ -32681,10 +32668,10 @@
 #: build/trans_presets.java:3703
 msgid "Edit associated street"
-msgstr ""
+msgstr "Editar calle asociada"
 
 #. item "Relations/Associated street" role "house"
 #: build/trans_presets.java:3708
 msgid "house"
-msgstr ""
+msgstr "casa"
 
 #. <!--
@@ -33419,5 +33406,5 @@
 #: build/trans_style.java:899 build/trans_style.java:900
 msgid "highway_platform"
-msgstr ""
+msgstr "plataforma de la carretera"
 
 #. <scale_min>1</scale_min>
@@ -36815,4 +36802,15 @@
 msgid "PCN 2006 - Italy"
 msgstr "PCN 2006 - Italia"
+
+#.
+#. only for France
+#. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html
+#: build/trans_wms.java:52
+#, fuzzy
+msgid "SPOTMaps (France)"
+msgstr "UTM Francia (DOM)"
+
+#~ msgid "Get Capabilities"
+#~ msgstr "Obtener capacidades"
 
 #~ msgid "Move"
@@ -38711,7 +38709,4 @@
 #~ msgstr "Etiqueta de edificación"
 
-#~ msgid "Seamark Editor"
-#~ msgstr "Editor de marcas marinas"
-
 #~ msgid "Edit OpenSeaMap"
 #~ msgstr "Editar OpenSeaMap"
@@ -38745,7 +38740,4 @@
 #~ "\"{0}\"."
 
-#~ msgid "Get Layers"
-#~ msgstr "Obtener capas"
-
 #~ msgid "Add relation"
 #~ msgstr "Añadir relación"
Index: /applications/editors/josm/i18n/po/et.po
===================================================================
--- /applications/editors/josm/i18n/po/et.po	(revision 23466)
+++ /applications/editors/josm/i18n/po/et.po	(revision 23467)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-01 19:14+0200\n"
-"PO-Revision-Date: 2010-09-18 17:21+0000\n"
+"POT-Creation-Date: 2010-10-03 22:45+0200\n"
+"PO-Revision-Date: 2010-10-01 19:43+0000\n"
 "Last-Translator: bastik <Unknown>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-10-01 16:30+0000\n"
+"X-Launchpad-Export-Date: 2010-10-03 20:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -85,5 +85,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:251
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:515
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:186
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121
@@ -226,5 +226,4 @@
 
 #. Strings in JFileChooser
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
@@ -275,7 +274,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:995
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:992
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119
@@ -300,5 +299,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
-#: build/specialmessages.java:33 build/specialmessages.java:90
+#: build/specialmessages.java:33
 msgid "Cancel"
 msgstr "Katkesta"
@@ -418,5 +417,5 @@
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:42
-#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:40
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -671,5 +670,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:145
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:509
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
@@ -1551,6 +1550,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:112
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:834
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:844
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:831
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:841
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:64
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:78
@@ -1614,5 +1613,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
-#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1327
+#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1340
 #: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1406
 #: build/specialmessages.java:65
@@ -1725,5 +1724,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
-#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1300
+#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1313
 #: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1382
 msgid "Close"
@@ -1776,5 +1775,4 @@
 msgstr "Palun vali lihtsustamiseks vähemalt üks tee."
 
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
@@ -1782,5 +1780,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:87
-#: build/specialmessages.java:88
 msgid "Yes"
 msgstr "Jah"
@@ -2497,5 +2494,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:783
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:108
@@ -2899,41 +2896,41 @@
 msgstr "Võtme väärtus ei saa olla tühi. Näide: võti=väärtus"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:459
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:449
 #, java-format
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:641
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:631
 #, java-format
 msgid "Unexpected token. Expected {0}, found {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:656
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:646
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:667
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:657
 msgid "Missing parameter for OR"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:692
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:682
 msgid "Missing operator for NOT"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:689
+msgid "Primitive id expected"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:691
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:694
+msgid "Range of numbers expected"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:697
+msgid "Changeset id expected"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:699
-msgid "Primitive id expected"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:701
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:704
-msgid "Range of numbers expected"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:707
-msgid "Changeset id expected"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:709
 msgid "Version expected"
 msgstr ""
@@ -2990,5 +2987,4 @@
 
 #. Strings in JFileChooser
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
@@ -3019,5 +3015,5 @@
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:686
-#: build/specialmessages.java:58 build/specialmessages.java:87
+#: build/specialmessages.java:58
 msgid "OK"
 msgstr "OK"
@@ -3610,5 +3606,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:243
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:258
 #, java-format
 msgid ""
@@ -3616,5 +3612,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:651
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:666
 #, java-format
 msgid ""
@@ -4456,5 +4452,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
 msgid "Presets"
@@ -6396,5 +6392,5 @@
 #. item "Highways/Streets/Roundabout" text "Name"
 #. <space />
-#. <key key="bridge" value="yes" />
+#. unparsed line             <combo key="bridge" values="yes,viaduct,swing,aqueduct" required="true" default="yes" text="Bridge" />
 #. <optional>
 #. item "Highways/Streets/Bridge" text "Name"
@@ -7689,5 +7685,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:572
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:639
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:146
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:143
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
 msgid "<different>"
@@ -9105,9 +9101,7 @@
 msgstr ""
 
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
-#: build/specialmessages.java:89
 msgid "No"
 msgstr ""
@@ -11950,5 +11944,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:489
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:512
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:514
 msgid "Please select an entry."
 msgstr ""
@@ -12365,38 +12359,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:266
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:270
 msgid "Actions"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:396
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:418
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:400
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:422
 msgid "Separator"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:580
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:584
 msgid "Toolbar"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:584
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:588
 msgid "Available"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:623
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:627
 msgid "Action parameters"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:624
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:628
 msgid "Parameter name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:625
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:629
 msgid "Parameter value"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:630
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:634
 msgid "Toolbar customization"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:631
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:635
 msgid "Customize the elements on the toolbar."
 msgstr ""
@@ -12708,5 +12702,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:384
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:381
 #, java-format
 msgid ""
@@ -12715,49 +12709,49 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:514
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:511
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:314
 msgid "More information about this feature"
 msgstr "Rohkem teavet sellest funktsioonist"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:551
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:548
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:605
+msgid "Available roles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:606
+msgid "role"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607
+msgid "count"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:608
-msgid "Available roles"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:609
-msgid "role"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:610
-msgid "count"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:611
 msgid "elements"
 msgstr ""
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:626
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:623
 msgid "Optional Attributes:"
 msgstr "Valikulised tunnused:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:724
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:721
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Tundmatu tüüp: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:792
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:789
 msgid "Preset role element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:800
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:797
 msgid "Preset sub element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:833
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:830
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -12767,15 +12761,15 @@
 msgstr "Ei saa lugeda sildistamise eelseadeid: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:843
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:840
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Viga sõelumisel {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:884
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:881
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Elemente tüübist {0} toetatakse."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:980
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:977
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -12785,22 +12779,22 @@
 msgstr[1] "Muuda {0} objekti"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:983
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:980
 msgid "Nothing selected!"
 msgstr "Midagi pole valitud!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:985
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:982
 msgid "Selection unsuitable!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:995
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:992
 msgid "Apply Preset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
 msgid "New relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1083
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1080
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -12829,9 +12823,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:273
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:278
 msgid "Show only applicable to selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:295
 msgid "Search in tags"
 msgstr ""
@@ -17955,4 +17949,13 @@
 msgstr ""
 
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:40
+msgid "Seamap Editor"
+msgstr ""
+
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+msgid "Seanap Editor"
+msgstr ""
+
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:38
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
@@ -19929,5 +19932,5 @@
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:90
 #, java-format
 msgid "{0} {1}% of GPS track"
@@ -20217,6 +20220,7 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88
-msgid "Get Capabilities"
-msgstr ""
+#, fuzzy
+msgid "Get Layers"
+msgstr "Kihid"
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124
@@ -20228,10 +20232,7 @@
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:126
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:161
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:236
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:254
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:273
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:277
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:310
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:222
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:244
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:262
 msgid "WMS Error"
 msgstr ""
@@ -20251,17 +20252,14 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:235
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:221
+msgid "Could not parse WMS layer list."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:243
 msgid "Invalid service URL."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:253
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:261
 msgid "Could not retrieve WMS layer list."
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:272
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:276
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:280
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:309
-msgid "Could not parse WMS layer list."
 msgstr ""
 
@@ -25480,7 +25478,6 @@
 
 #: build/trans_presets.java:1506
-#, fuzzy
 msgid "used"
-msgstr "Muuseum"
+msgstr ""
 
 #: build/trans_presets.java:1508 build/trans_presets.java:1509
@@ -26104,7 +26101,6 @@
 
 #: build/trans_presets.java:1828
-#, fuzzy
 msgid "interval"
-msgstr "tööstus"
+msgstr ""
 
 #. item "Travel/Accomodation/Caravan Site" check "Power supply"
@@ -26115,7 +26111,6 @@
 #. item "Travel/Accomodation/Caravan Site" check "Tents allowed"
 #: build/trans_presets.java:1830
-#, fuzzy
 msgid "Tents allowed"
-msgstr "Ainult kaks sõlme lubatud."
+msgstr ""
 
 #. item "Travel/Accomodation/Camping Site"
@@ -28686,13 +28681,11 @@
 #. item "Man Made/Mineshaft" label "Edit Mineshaft"
 #: build/trans_presets.java:2722
-#, fuzzy
 msgid "Edit Mineshaft"
-msgstr "Vali kino"
+msgstr ""
 
 #. item "Man Made/Mineshaft" text "Depth in meters"
 #: build/trans_presets.java:2725
-#, fuzzy
 msgid "Depth in meters"
-msgstr "Kõrgus (meetrites)"
+msgstr ""
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
@@ -28958,7 +28951,6 @@
 #. item "Amenities/Clock"
 #: build/trans_presets.java:2825
-#, fuzzy
 msgid "Clock"
-msgstr "Lukusta"
+msgstr ""
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=clock"
@@ -28966,7 +28958,6 @@
 #. item "Amenities/Clock" label "Edit Clock"
 #: build/trans_presets.java:2828
-#, fuzzy
 msgid "Edit Clock"
-msgstr "Hoki muutmine"
+msgstr ""
 
 #. <key key="amenity" value="clock" />
@@ -28974,7 +28965,6 @@
 #. item "Amenities/Clock" combo "Display"
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "Display"
-msgstr "Vaateseadistused"
+msgstr ""
 
 #: build/trans_presets.java:2831
@@ -28983,23 +28973,19 @@
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "digital"
-msgstr "Vali haigla"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "sundial"
-msgstr "india"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "unorthodox"
-msgstr "ortodoksne"
+msgstr ""
 
 #. item "Amenities/Clock" combo "Support"
 #: build/trans_presets.java:2832
-#, fuzzy
 msgid "Support"
-msgstr "Sport"
+msgstr ""
 
 #: build/trans_presets.java:2832
@@ -29030,7 +29016,6 @@
 #. item "Amenities/Clock" check "Shows current date"
 #: build/trans_presets.java:2834
-#, fuzzy
 msgid "Shows current date"
-msgstr "Salvesta praegused andmed"
+msgstr ""
 
 #. item "Amenities/Clock" check "Shows temperature"
@@ -35111,4 +35096,11 @@
 msgstr "PCN 2006 - Itaalia"
 
+#.
+#. only for France
+#. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html
+#: build/trans_wms.java:52
+msgid "SPOTMaps (France)"
+msgstr ""
+
 #~ msgid "Upload to OSM..."
 #~ msgstr "Lae OSMi serverisse"
Index: /applications/editors/josm/i18n/po/eu.po
===================================================================
--- /applications/editors/josm/i18n/po/eu.po	(revision 23466)
+++ /applications/editors/josm/i18n/po/eu.po	(revision 23467)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-01 19:14+0200\n"
-"PO-Revision-Date: 2010-07-06 17:47+0000\n"
+"POT-Creation-Date: 2010-10-03 22:45+0200\n"
+"PO-Revision-Date: 2010-10-01 20:20+0000\n"
 "Last-Translator: Mikel Lizarralde <mlizarralde@tagzania.com>\n"
 "Language-Team: Basque <eu@li.org>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-10-01 16:24+0000\n"
+"X-Launchpad-Export-Date: 2010-10-03 20:35+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -85,5 +85,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:251
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:515
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:186
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121
@@ -232,5 +232,4 @@
 
 #. Strings in JFileChooser
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
@@ -281,7 +280,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:995
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:992
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119
@@ -306,5 +305,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
-#: build/specialmessages.java:33 build/specialmessages.java:90
+#: build/specialmessages.java:33
 msgid "Cancel"
 msgstr "Utzi"
@@ -426,5 +425,5 @@
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:42
-#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:40
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -680,5 +679,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:145
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:509
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
@@ -1597,6 +1596,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:112
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:834
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:844
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:831
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:841
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:64
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:78
@@ -1660,5 +1659,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
-#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1327
+#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1340
 #: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1406
 #: build/specialmessages.java:65
@@ -1774,5 +1773,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
-#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1300
+#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1313
 #: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1382
 msgid "Close"
@@ -1825,5 +1824,4 @@
 msgstr "Mesedez, aukera ezazu gutxienez bide bat sinplifikatzeko."
 
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
@@ -1831,5 +1829,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:87
-#: build/specialmessages.java:88
 msgid "Yes"
 msgstr "Bai"
@@ -2582,5 +2579,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:783
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:108
@@ -3029,5 +3026,5 @@
 "adibidea: giltza=balioa"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:459
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:449
 #, java-format
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
@@ -3036,36 +3033,36 @@
 "edo erlazio"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:641
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:631
 #, java-format
 msgid "Unexpected token. Expected {0}, found {1}"
 msgstr "Espero ez zen ezaugarria. Hauxe espero zen: {0}, hauxe aurkitu da: {1}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:656
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:646
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr "Ustegabeko tokena: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:667
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:657
 msgid "Missing parameter for OR"
 msgstr "Parametro galdua OR horrentzat"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:692
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:682
 msgid "Missing operator for NOT"
 msgstr "Eragilea falta da NOT eragiketan"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:699
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:689
 msgid "Primitive id expected"
 msgstr "Hasierako identidadea espero zen"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:701
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:704
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:691
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:694
 msgid "Range of numbers expected"
 msgstr "Zenbaki-tarte bat espero zen"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:707
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:697
 msgid "Changeset id expected"
 msgstr "Espero zen aldaketa multzoa"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:709
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:699
 msgid "Version expected"
 msgstr "Espero zen bertsioa"
@@ -3131,5 +3128,4 @@
 
 #. Strings in JFileChooser
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
@@ -3160,5 +3156,5 @@
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:686
-#: build/specialmessages.java:58 build/specialmessages.java:87
+#: build/specialmessages.java:58
 msgid "OK"
 msgstr "Ados"
@@ -3784,5 +3780,5 @@
 msgstr "E"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:243
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:258
 #, java-format
 msgid ""
@@ -3791,5 +3787,5 @@
 "Ezin izan da jatorrizko {0}-a gehitu datu-multzora beronen barne delako jada"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:651
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:666
 #, java-format
 msgid ""
@@ -4661,5 +4657,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
 msgid "Presets"
@@ -6641,5 +6637,5 @@
 #. item "Highways/Streets/Roundabout" text "Name"
 #. <space />
-#. <key key="bridge" value="yes" />
+#. unparsed line             <combo key="bridge" values="yes,viaduct,swing,aqueduct" required="true" default="yes" text="Bridge" />
 #. <optional>
 #. item "Highways/Streets/Bridge" text "Name"
@@ -7934,5 +7930,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:572
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:639
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:146
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:143
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
 msgid "<different>"
@@ -9347,9 +9343,7 @@
 msgstr ""
 
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
-#: build/specialmessages.java:89
 msgid "No"
 msgstr ""
@@ -12188,5 +12182,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:489
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:512
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:514
 msgid "Please select an entry."
 msgstr ""
@@ -12603,38 +12597,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:266
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:270
 msgid "Actions"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:396
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:418
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:400
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:422
 msgid "Separator"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:580
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:584
 msgid "Toolbar"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:584
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:588
 msgid "Available"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:623
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:627
 msgid "Action parameters"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:624
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:628
 msgid "Parameter name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:625
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:629
 msgid "Parameter value"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:630
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:634
 msgid "Toolbar customization"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:631
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:635
 msgid "Customize the elements on the toolbar."
 msgstr ""
@@ -12940,5 +12934,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:384
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:381
 #, java-format
 msgid ""
@@ -12947,49 +12941,49 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:514
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:511
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:314
 msgid "More information about this feature"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:551
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:548
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:605
+msgid "Available roles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:606
+msgid "role"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607
+msgid "count"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:608
-msgid "Available roles"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:609
-msgid "role"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:610
-msgid "count"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:611
 msgid "elements"
 msgstr ""
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:626
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:623
 msgid "Optional Attributes:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:724
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:721
 #, java-format
 msgid "Unknown type: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:792
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:789
 msgid "Preset role element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:800
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:797
 msgid "Preset sub element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:833
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:830
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -12999,15 +12993,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:843
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:840
 #, java-format
 msgid "Error parsing {0}: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:884
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:881
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:980
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:977
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -13017,22 +13011,22 @@
 msgstr[1] "Aldatu {0} objektuak"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:983
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:980
 msgid "Nothing selected!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:985
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:982
 msgid "Selection unsuitable!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:995
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:992
 msgid "Apply Preset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
 msgid "New relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1083
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1080
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -13061,9 +13055,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:273
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:278
 msgid "Show only applicable to selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:295
 msgid "Search in tags"
 msgstr ""
@@ -18178,4 +18172,13 @@
 msgstr ""
 
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:40
+msgid "Seamap Editor"
+msgstr ""
+
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+msgid "Seanap Editor"
+msgstr ""
+
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:38
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
@@ -20164,5 +20167,5 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:90
 #, java-format
 msgid "{0} {1}% of GPS track"
@@ -20460,6 +20463,7 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88
-msgid "Get Capabilities"
-msgstr ""
+#, fuzzy
+msgid "Get Layers"
+msgstr "Geruzak"
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124
@@ -20471,10 +20475,7 @@
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:126
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:161
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:236
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:254
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:273
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:277
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:310
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:222
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:244
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:262
 msgid "WMS Error"
 msgstr ""
@@ -20494,17 +20495,14 @@
 msgstr "WMSaren URL helbidea"
 
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:235
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:221
+msgid "Could not parse WMS layer list."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:243
 msgid "Invalid service URL."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:253
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:261
 msgid "Could not retrieve WMS layer list."
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:272
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:276
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:280
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:309
-msgid "Could not parse WMS layer list."
 msgstr ""
 
@@ -22043,7 +22041,6 @@
 #: build/trans_presets.java:588 build/trans_presets.java:611
 #: build/trans_presets.java:630 build/trans_presets.java:651
-#, fuzzy
 msgid "Lit"
-msgstr "Zerrenda"
+msgstr ""
 
 #. </optional>
@@ -22945,7 +22942,6 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. axleload (tonnes)"
 #: build/trans_presets.java:416
-#, fuzzy
 msgid "Max. axleload (tonnes)"
-msgstr "Gehienezko pixua (t)"
+msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
@@ -25798,7 +25794,6 @@
 
 #: build/trans_presets.java:1506
-#, fuzzy
 msgid "used"
-msgstr "erabilera"
+msgstr ""
 
 #: build/trans_presets.java:1508 build/trans_presets.java:1509
@@ -25807,7 +25802,6 @@
 
 #: build/trans_presets.java:1508 build/trans_presets.java:1509
-#, fuzzy
 msgid "oldtimer"
-msgstr "Karpetak"
+msgstr ""
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Parts"
@@ -26423,7 +26417,6 @@
 
 #: build/trans_presets.java:1828
-#, fuzzy
 msgid "interval"
-msgstr "industriala"
+msgstr ""
 
 #. item "Travel/Accomodation/Caravan Site" check "Power supply"
@@ -29004,13 +28997,11 @@
 #. item "Man Made/Mineshaft" label "Edit Mineshaft"
 #: build/trans_presets.java:2722
-#, fuzzy
 msgid "Edit Mineshaft"
-msgstr "Kirol-portua editatu"
+msgstr ""
 
 #. item "Man Made/Mineshaft" text "Depth in meters"
 #: build/trans_presets.java:2725
-#, fuzzy
 msgid "Depth in meters"
-msgstr "Zabalera (metroak)"
+msgstr ""
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
@@ -29276,7 +29267,6 @@
 #. item "Amenities/Clock"
 #: build/trans_presets.java:2825
-#, fuzzy
 msgid "Clock"
-msgstr "Blokea"
+msgstr ""
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=clock"
@@ -29284,7 +29274,6 @@
 #. item "Amenities/Clock" label "Edit Clock"
 #: build/trans_presets.java:2828
-#, fuzzy
 msgid "Edit Clock"
-msgstr "Moila editatu"
+msgstr ""
 
 #. <key key="amenity" value="clock" />
@@ -29292,33 +29281,27 @@
 #. item "Amenities/Clock" combo "Display"
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "Display"
-msgstr "erreproduzitu"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "analog"
-msgstr "Kanala"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "digital"
-msgstr "Trena editatu"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "sundial"
-msgstr "suni"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "unorthodox"
-msgstr "ortodoxo"
+msgstr ""
 
 #. item "Amenities/Clock" combo "Support"
 #: build/trans_presets.java:2832
-#, fuzzy
 msgid "Support"
-msgstr "Kirola"
+msgstr ""
 
 #: build/trans_presets.java:2832
@@ -29327,7 +29310,6 @@
 
 #: build/trans_presets.java:2832
-#, fuzzy
 msgid "billboard"
-msgstr "Bolardoa"
+msgstr ""
 
 #. item "Amenities/Clock" combo "Visibility/readability"
@@ -29337,7 +29319,6 @@
 
 #: build/trans_presets.java:2833
-#, fuzzy
 msgid "(up to 5m)"
-msgstr "koadrora"
+msgstr ""
 
 #: build/trans_presets.java:2833
@@ -29351,7 +29332,6 @@
 #. item "Amenities/Clock" check "Shows current date"
 #: build/trans_presets.java:2834
-#, fuzzy
 msgid "Shows current date"
-msgstr "Gorde orain arteko datuak."
+msgstr ""
 
 #. item "Amenities/Clock" check "Shows temperature"
@@ -29367,7 +29347,6 @@
 #. item "Amenities/Clock" check "Shows humidity"
 #: build/trans_presets.java:2837
-#, fuzzy
 msgid "Shows humidity"
-msgstr "Historia erakutsi"
+msgstr ""
 
 #. </optional>
@@ -35433,4 +35412,12 @@
 msgstr ""
 
+#.
+#. only for France
+#. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html
+#: build/trans_wms.java:52
+#, fuzzy
+msgid "SPOTMaps (France)"
+msgstr "UTM Frantzia (DOM)"
+
 #~ msgid "Enter values for all conflicts."
 #~ msgstr "Gatazka guztientzako balioak sartu"
Index: /applications/editors/josm/i18n/po/fi.po
===================================================================
--- /applications/editors/josm/i18n/po/fi.po	(revision 23466)
+++ /applications/editors/josm/i18n/po/fi.po	(revision 23467)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-01 19:14+0200\n"
-"PO-Revision-Date: 2010-09-06 01:44+0000\n"
+"POT-Creation-Date: 2010-10-03 22:45+0200\n"
+"PO-Revision-Date: 2010-10-01 20:01+0000\n"
 "Last-Translator: Mika Laari <laari@iki.fi>\n"
 "Language-Team: Finnish <fi@li.org>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-10-01 16:26+0000\n"
+"X-Launchpad-Export-Date: 2010-10-03 20:34+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -85,5 +85,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:251
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:515
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:186
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121
@@ -230,5 +230,4 @@
 
 #. Strings in JFileChooser
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
@@ -279,7 +278,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:995
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:992
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119
@@ -304,5 +303,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
-#: build/specialmessages.java:33 build/specialmessages.java:90
+#: build/specialmessages.java:33
 msgid "Cancel"
 msgstr "Peruuta"
@@ -424,5 +423,5 @@
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:42
-#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:40
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -677,5 +676,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:145
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:509
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
@@ -1585,6 +1584,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:112
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:834
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:844
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:831
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:841
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:64
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:78
@@ -1648,5 +1647,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
-#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1327
+#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1340
 #: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1406
 #: build/specialmessages.java:65
@@ -1760,5 +1759,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
-#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1300
+#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1313
 #: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1382
 msgid "Close"
@@ -1811,5 +1810,4 @@
 msgstr "Valitse vähintään yksi polku jonka haluat yksinkertaistaa."
 
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
@@ -1817,5 +1815,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:87
-#: build/specialmessages.java:88
 msgid "Yes"
 msgstr "Kyllä"
@@ -2559,5 +2556,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:783
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:108
@@ -3003,5 +3000,5 @@
 "Avain ei saa olla tyhjä, kun käytetään tägi-operaattoria. Malli: avain=arvo"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:459
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:449
 #, java-format
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
@@ -3009,36 +3006,36 @@
 "Tuntematon objektin tyyppi: {0}. Sallitut arvot ovat node, way ja relation"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:641
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:631
 #, java-format
 msgid "Unexpected token. Expected {0}, found {1}"
 msgstr "Odottamaton symboli. Odotettu {0}, löydetty {1}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:656
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:646
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr "Odottamaton symboli: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:667
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:657
 msgid "Missing parameter for OR"
 msgstr "OR-operaattorilta puuttuu parametri"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:692
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:682
 msgid "Missing operator for NOT"
 msgstr "EI-operaattorilta puuttuu parametri"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:699
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:689
 msgid "Primitive id expected"
 msgstr "Olisi pitänyt olla objektin tunniste"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:701
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:704
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:691
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:694
 msgid "Range of numbers expected"
 msgstr "Odotettiin lukuväliä"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:707
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:697
 msgid "Changeset id expected"
 msgstr "Odotettiin muutoskokoelman tunnusta"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:709
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:699
 msgid "Version expected"
 msgstr "Odotettiin versiota"
@@ -3100,5 +3097,4 @@
 
 #. Strings in JFileChooser
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
@@ -3129,5 +3125,5 @@
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:686
-#: build/specialmessages.java:58 build/specialmessages.java:87
+#: build/specialmessages.java:58
 msgid "OK"
 msgstr "OK"
@@ -3757,5 +3753,5 @@
 msgstr "I"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:243
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:258
 #, java-format
 msgid ""
@@ -3763,5 +3759,5 @@
 msgstr "Objektia {0} ei voi lisätä datajoukkoon, koska se kuuluu jo siihen"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:651
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:666
 #, java-format
 msgid ""
@@ -4631,5 +4627,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
 msgid "Presets"
@@ -6641,5 +6637,5 @@
 #. item "Highways/Streets/Roundabout" text "Name"
 #. <space />
-#. <key key="bridge" value="yes" />
+#. unparsed line             <combo key="bridge" values="yes,viaduct,swing,aqueduct" required="true" default="yes" text="Bridge" />
 #. <optional>
 #. item "Highways/Streets/Bridge" text "Name"
@@ -7935,5 +7931,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:572
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:639
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:146
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:143
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
 msgid "<different>"
@@ -9405,9 +9401,7 @@
 msgstr ""
 
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
-#: build/specialmessages.java:89
 msgid "No"
 msgstr ""
@@ -12295,5 +12289,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:489
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:512
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:514
 msgid "Please select an entry."
 msgstr "Valitse kohta."
@@ -12712,38 +12706,38 @@
 msgstr "Tagien esivalinnat"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:266
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:270
 msgid "Actions"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:396
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:418
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:400
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:422
 msgid "Separator"
 msgstr "Erotin"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:580
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:584
 msgid "Toolbar"
 msgstr "Työkalupalkki"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:584
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:588
 msgid "Available"
 msgstr "Käytettävissä"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:623
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:627
 msgid "Action parameters"
 msgstr "Toimintoparametrit"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:624
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:628
 msgid "Parameter name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:625
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:629
 msgid "Parameter value"
 msgstr "Parametrin arvo"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:630
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:634
 msgid "Toolbar customization"
 msgstr "Työkalurivin muokkaus"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:631
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:635
 msgid "Customize the elements on the toolbar."
 msgstr "Muokkaa työkalupalkin elementtejä."
@@ -13057,5 +13051,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:384
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:381
 #, java-format
 msgid ""
@@ -13064,49 +13058,49 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:514
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:511
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:314
 msgid "More information about this feature"
 msgstr "Lisää tietoja tästä ominaisuudesta"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:551
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:548
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:605
+msgid "Available roles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:606
+msgid "role"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607
+msgid "count"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:608
-msgid "Available roles"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:609
-msgid "role"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:610
-msgid "count"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:611
 msgid "elements"
 msgstr ""
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:626
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:623
 msgid "Optional Attributes:"
 msgstr "Lisäominaisuudet:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:724
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:721
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Tuntematon tyyppi: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:792
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:789
 msgid "Preset role element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:800
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:797
 msgid "Preset sub element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:833
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:830
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -13116,15 +13110,15 @@
 msgstr "Tagien esiasetuslähdettä ei voitu lukea: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:843
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:840
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Virhe käsiteltäessä {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:884
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:881
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:980
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:977
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -13134,22 +13128,22 @@
 msgstr[1] "Muuta {0} objektia"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:983
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:980
 msgid "Nothing selected!"
 msgstr "Ei mitään valittuna!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:985
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:982
 msgid "Selection unsuitable!"
 msgstr "Valinta ei ole sopiva!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:995
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:992
 msgid "Apply Preset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
 msgid "New relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1083
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1080
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -13178,9 +13172,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:273
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:278
 msgid "Show only applicable to selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:295
 msgid "Search in tags"
 msgstr ""
@@ -18361,4 +18355,15 @@
 msgstr ""
 
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:40
+#, fuzzy
+msgid "Seamap Editor"
+msgstr "Erotin"
+
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#, fuzzy
+msgid "Seanap Editor"
+msgstr "Erotin"
+
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:38
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
@@ -20357,5 +20362,5 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:90
 #, java-format
 msgid "{0} {1}% of GPS track"
@@ -20645,6 +20650,7 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88
-msgid "Get Capabilities"
-msgstr ""
+#, fuzzy
+msgid "Get Layers"
+msgstr "Tasot"
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124
@@ -20656,10 +20662,7 @@
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:126
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:161
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:236
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:254
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:273
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:277
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:310
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:222
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:244
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:262
 msgid "WMS Error"
 msgstr ""
@@ -20679,17 +20682,14 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:235
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:221
+msgid "Could not parse WMS layer list."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:243
 msgid "Invalid service URL."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:253
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:261
 msgid "Could not retrieve WMS layer list."
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:272
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:276
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:280
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:309
-msgid "Could not parse WMS layer list."
 msgstr ""
 
@@ -23060,7 +23060,6 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. axleload (tonnes)"
 #: build/trans_presets.java:416
-#, fuzzy
 msgid "Max. axleload (tonnes)"
-msgstr "Maksimipaino (tonnia)"
+msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
@@ -25913,7 +25912,6 @@
 
 #: build/trans_presets.java:1506
-#, fuzzy
 msgid "used"
-msgstr "käyttö"
+msgstr ""
 
 #: build/trans_presets.java:1508 build/trans_presets.java:1509
@@ -26537,7 +26535,6 @@
 
 #: build/trans_presets.java:1828
-#, fuzzy
 msgid "interval"
-msgstr "teollisuus"
+msgstr ""
 
 #. item "Travel/Accomodation/Caravan Site" check "Power supply"
@@ -26548,7 +26545,6 @@
 #. item "Travel/Accomodation/Caravan Site" check "Tents allowed"
 #: build/trans_presets.java:1830
-#, fuzzy
 msgid "Tents allowed"
-msgstr "Vain kaksi pistettä sallittu"
+msgstr ""
 
 #. item "Travel/Accomodation/Camping Site"
@@ -29119,13 +29115,11 @@
 #. item "Man Made/Mineshaft" label "Edit Mineshaft"
 #: build/trans_presets.java:2722
-#, fuzzy
 msgid "Edit Mineshaft"
-msgstr "Muokkaa elokuvateatterin ominaisuuksia"
+msgstr ""
 
 #. item "Man Made/Mineshaft" text "Depth in meters"
 #: build/trans_presets.java:2725
-#, fuzzy
 msgid "Depth in meters"
-msgstr "Toimintoparametrit"
+msgstr ""
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
@@ -29391,7 +29385,6 @@
 #. item "Amenities/Clock"
 #: build/trans_presets.java:2825
-#, fuzzy
 msgid "Clock"
-msgstr "Telakka"
+msgstr ""
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=clock"
@@ -29399,7 +29392,6 @@
 #. item "Amenities/Clock" label "Edit Clock"
 #: build/trans_presets.java:2828
-#, fuzzy
 msgid "Edit Clock"
-msgstr "Muokkaa jääkiekkopaikan ominaisuuksia"
+msgstr ""
 
 #. <key key="amenity" value="clock" />
@@ -29407,33 +29399,27 @@
 #. item "Amenities/Clock" combo "Display"
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "Display"
-msgstr "saari"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "analog"
-msgstr "Kanava"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "digital"
-msgstr "Muokkaa rautatien seisaketta"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "sundial"
-msgstr "intialainen"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "unorthodox"
-msgstr "pohjoinen"
+msgstr ""
 
 #. item "Amenities/Clock" combo "Support"
 #: build/trans_presets.java:2832
-#, fuzzy
 msgid "Support"
-msgstr "Urheilu"
+msgstr ""
 
 #: build/trans_presets.java:2832
@@ -29451,7 +29437,6 @@
 
 #: build/trans_presets.java:2833
-#, fuzzy
 msgid "(up to 5m)"
-msgstr "ruutuun"
+msgstr ""
 
 #: build/trans_presets.java:2833
@@ -29465,7 +29450,6 @@
 #. item "Amenities/Clock" check "Shows current date"
 #: build/trans_presets.java:2834
-#, fuzzy
 msgid "Shows current date"
-msgstr "Tallenna tämänhetkinen data."
+msgstr ""
 
 #. item "Amenities/Clock" check "Shows temperature"
@@ -29481,7 +29465,6 @@
 #. item "Amenities/Clock" check "Shows humidity"
 #: build/trans_presets.java:2837
-#, fuzzy
 msgid "Shows humidity"
-msgstr "Näytä historia"
+msgstr ""
 
 #. </optional>
@@ -35547,4 +35530,12 @@
 msgstr ""
 
+#.
+#. only for France
+#. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html
+#: build/trans_wms.java:52
+#, fuzzy
+msgid "SPOTMaps (France)"
+msgstr "UTM Ranska (DOM)"
+
 #~ msgid "Enter values for all conflicts."
 #~ msgstr "Syötä arvot kaikille ristiriidoille."
Index: /applications/editors/josm/i18n/po/fr.po
===================================================================
--- /applications/editors/josm/i18n/po/fr.po	(revision 23466)
+++ /applications/editors/josm/i18n/po/fr.po	(revision 23467)
@@ -6,7 +6,7 @@
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-01 19:14+0200\n"
-"PO-Revision-Date: 2010-09-25 16:24+0000\n"
-"Last-Translator: Arnaud Mouronval <Unknown>\n"
+"POT-Creation-Date: 2010-10-03 22:45+0200\n"
+"PO-Revision-Date: 2010-10-01 19:46+0000\n"
+"Last-Translator: bastik <Unknown>\n"
 "Language-Team: Fr <>\n"
 "MIME-Version: 1.0\n"
@@ -14,5 +14,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2010-10-01 16:27+0000\n"
+"X-Launchpad-Export-Date: 2010-10-03 20:34+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Language: French\n"
@@ -84,5 +84,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:251
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:515
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:186
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121
@@ -229,5 +229,4 @@
 
 #. Strings in JFileChooser
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
@@ -278,7 +277,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:995
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:992
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119
@@ -303,5 +302,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
-#: build/specialmessages.java:33 build/specialmessages.java:90
+#: build/specialmessages.java:33
 msgid "Cancel"
 msgstr "Annuler"
@@ -424,5 +423,5 @@
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:42
-#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:40
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -679,5 +678,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:145
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:509
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
@@ -1598,6 +1597,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:112
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:834
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:844
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:831
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:841
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:64
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:78
@@ -1661,5 +1660,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
-#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1327
+#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1340
 #: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1406
 #: build/specialmessages.java:65
@@ -1775,5 +1774,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
-#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1300
+#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1313
 #: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1382
 msgid "Close"
@@ -1826,5 +1825,4 @@
 msgstr "Veuillez sélectionner au moins un chemin à simplifier."
 
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
@@ -1832,5 +1830,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:87
-#: build/specialmessages.java:88
 msgid "Yes"
 msgstr "Oui"
@@ -2581,5 +2578,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:783
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:108
@@ -3032,5 +3029,5 @@
 "d’utilisation : clé=valeur"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:459
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:449
 #, java-format
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
@@ -3039,36 +3036,36 @@
 "relation"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:641
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:631
 #, java-format
 msgid "Unexpected token. Expected {0}, found {1}"
 msgstr "Jeton inattendu. Attendu {0}, trouvé {1}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:656
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:646
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr "Jeton inattendu : {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:667
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:657
 msgid "Missing parameter for OR"
 msgstr "Paramètre manquant pour OR"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:692
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:682
 msgid "Missing operator for NOT"
 msgstr "Paramètre manquant pour NOT"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:699
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:689
 msgid "Primitive id expected"
 msgstr "Identifiant de primitive attendu"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:701
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:704
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:691
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:694
 msgid "Range of numbers expected"
 msgstr "Série de nombres attendus"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:707
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:697
 msgid "Changeset id expected"
 msgstr "Identifiant de groupe de modifications attendu"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:709
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:699
 msgid "Version expected"
 msgstr "Version attendue"
@@ -3134,5 +3131,4 @@
 
 #. Strings in JFileChooser
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
@@ -3163,5 +3159,5 @@
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:686
-#: build/specialmessages.java:58 build/specialmessages.java:87
+#: build/specialmessages.java:58
 msgid "OK"
 msgstr "OK"
@@ -3799,5 +3795,5 @@
 msgstr "E"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:243
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:258
 #, java-format
 msgid ""
@@ -3807,5 +3803,5 @@
 "inclue"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:651
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:666
 #, java-format
 msgid ""
@@ -4692,5 +4688,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
 msgid "Presets"
@@ -6738,5 +6734,5 @@
 #. item "Highways/Streets/Roundabout" text "Name"
 #. <space />
-#. <key key="bridge" value="yes" />
+#. unparsed line             <combo key="bridge" values="yes,viaduct,swing,aqueduct" required="true" default="yes" text="Bridge" />
 #. <optional>
 #. item "Highways/Streets/Bridge" text "Name"
@@ -8085,5 +8081,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:572
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:639
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:146
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:143
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
 msgid "<different>"
@@ -9626,9 +9622,7 @@
 msgstr "Sélectionner un nom de fichier"
 
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
-#: build/specialmessages.java:89
 msgid "No"
 msgstr "Non"
@@ -12788,5 +12782,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:489
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:512
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:514
 msgid "Please select an entry."
 msgstr "Sélectionnez une entrée."
@@ -13244,38 +13238,38 @@
 msgstr "Pré-réglages des attribus"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:266
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:270
 msgid "Actions"
 msgstr "Actions"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:396
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:418
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:400
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:422
 msgid "Separator"
 msgstr "Séparateur"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:580
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:584
 msgid "Toolbar"
 msgstr "Barre d’outils"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:584
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:588
 msgid "Available"
 msgstr "Disponible"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:623
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:627
 msgid "Action parameters"
 msgstr "Paramètres d'action"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:624
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:628
 msgid "Parameter name"
 msgstr "Nom du paramètre"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:625
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:629
 msgid "Parameter value"
 msgstr "Valeur du paramètre"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:630
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:634
 msgid "Toolbar customization"
 msgstr "Personnalisation de la barre d’outils"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:631
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:635
 msgid "Customize the elements on the toolbar."
 msgstr "Personnaliser les éléments de la barre d’outils."
@@ -13621,5 +13615,5 @@
 msgstr "Ajouter un nouvel attribut"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:384
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:381
 #, java-format
 msgid ""
@@ -13630,49 +13624,49 @@
 "display_values doit être le même que dans les valeurs"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:514
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:511
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:314
 msgid "More information about this feature"
 msgstr "Plus d’infos sur cette caractéristique"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:551
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:548
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr "Prérequis inconnu : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:608
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:605
 msgid "Available roles"
 msgstr "Rôles disponibles"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:609
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:606
 msgid "role"
 msgstr "rôle"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:610
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607
 msgid "count"
 msgstr "nombre"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:611
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:608
 msgid "elements"
 msgstr "éléments"
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:626
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:623
 msgid "Optional Attributes:"
 msgstr "Attributs optionnels :"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:724
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:721
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Type inconnu : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:792
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:789
 msgid "Preset role element without parent"
 msgstr "Élément de rôle prédéfini sans parent"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:800
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:797
 msgid "Preset sub element without parent"
 msgstr "Sous élément prédéfini sans parent"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:833
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:830
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -13682,15 +13676,15 @@
 msgstr "Impossible de lire la source des balises : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:843
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:840
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Erreur d’analyse de {0} : "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:884
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:881
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Les éléments de type {0} sont supportés."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:980
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:977
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -13700,22 +13694,22 @@
 msgstr[1] "Modifier {0} objets"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:983
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:980
 msgid "Nothing selected!"
 msgstr "Rien n’est sélectionné !"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:985
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:982
 msgid "Selection unsuitable!"
 msgstr "Sélection inappropriée !"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:995
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:992
 msgid "Apply Preset"
 msgstr "Appliquer le pré-réglage"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
 msgid "New relation"
 msgstr "Nouvelle relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1083
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1080
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -13744,9 +13738,9 @@
 msgstr "Préreglages de recherche"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:273
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:278
 msgid "Show only applicable to selection"
 msgstr "Montrer que ce qui est applicable à la sélection"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:295
 msgid "Search in tags"
 msgstr "Recherche dans les mots-clés"
@@ -19166,7 +19160,6 @@
 
 #: ../plugins/rgisopen/src/rgisopen/RGISLayerFromFileAction.java:34
-#, fuzzy
 msgid "New picture layer from RGIS..."
-msgstr "Nouveau calque image depuis le fichier..."
+msgstr ""
 
 #: ../plugins/rgisopen/src/rgisopen/RGISOpenPlugin.java:33
@@ -19408,4 +19401,15 @@
 msgid "Fade background: "
 msgstr "Pâlissement graduel de l’arrière plan : "
+
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:40
+#, fuzzy
+msgid "Seamap Editor"
+msgstr "Éditeur Seamark"
+
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#, fuzzy
+msgid "Seanap Editor"
+msgstr "Éditeur Seamark"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:38
@@ -21525,5 +21529,5 @@
 msgstr "{0}…"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:90
 #, java-format
 msgid "{0} {1}% of GPS track"
@@ -21830,6 +21834,6 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88
-msgid "Get Capabilities"
-msgstr ""
+msgid "Get Layers"
+msgstr "Obtenir les calques"
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124
@@ -21841,10 +21845,7 @@
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:126
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:161
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:236
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:254
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:273
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:277
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:310
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:222
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:244
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:262
 msgid "WMS Error"
 msgstr "Erreur WMS"
@@ -21864,18 +21865,15 @@
 msgstr "URL du service WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:235
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:221
+msgid "Could not parse WMS layer list."
+msgstr "Impossible d'analyser la liste des calques WMS."
+
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:243
 msgid "Invalid service URL."
 msgstr "Url de service invalide."
 
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:253
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:261
 msgid "Could not retrieve WMS layer list."
 msgstr "Impossible d'obtenir la liste des calques WMS."
-
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:272
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:276
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:280
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:309
-msgid "Could not parse WMS layer list."
-msgstr "Impossible d'analyser la liste des calques WMS."
 
 #: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:76
@@ -23415,7 +23413,6 @@
 #: build/trans_presets.java:588 build/trans_presets.java:611
 #: build/trans_presets.java:630 build/trans_presets.java:651
-#, fuzzy
 msgid "Lit"
-msgstr "Liste"
+msgstr ""
 
 #. </optional>
@@ -24317,7 +24314,6 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. axleload (tonnes)"
 #: build/trans_presets.java:416
-#, fuzzy
 msgid "Max. axleload (tonnes)"
-msgstr "Poids max. (tonnes)"
+msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
@@ -27170,7 +27166,6 @@
 
 #: build/trans_presets.java:1506
-#, fuzzy
 msgid "used"
-msgstr "unutilisé"
+msgstr ""
 
 #: build/trans_presets.java:1508 build/trans_presets.java:1509
@@ -27179,7 +27174,6 @@
 
 #: build/trans_presets.java:1508 build/trans_presets.java:1509
-#, fuzzy
 msgid "oldtimer"
-msgstr "dossier"
+msgstr ""
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Parts"
@@ -27791,12 +27785,10 @@
 #. item "Travel/Accomodation/Caravan Site" combo "Requires a fee"
 #: build/trans_presets.java:1828
-#, fuzzy
 msgid "Requires a fee"
-msgstr "Requête Échouée"
+msgstr ""
 
 #: build/trans_presets.java:1828
-#, fuzzy
 msgid "interval"
-msgstr "zone industrielle"
+msgstr ""
 
 #. item "Travel/Accomodation/Caravan Site" check "Power supply"
@@ -27807,7 +27799,6 @@
 #. item "Travel/Accomodation/Caravan Site" check "Tents allowed"
 #: build/trans_presets.java:1830
-#, fuzzy
 msgid "Tents allowed"
-msgstr "Test échoué"
+msgstr ""
 
 #. item "Travel/Accomodation/Camping Site"
@@ -30379,13 +30370,11 @@
 #. item "Man Made/Mineshaft" label "Edit Mineshaft"
 #: build/trans_presets.java:2722
-#, fuzzy
 msgid "Edit Mineshaft"
-msgstr "Modifier une marina"
+msgstr ""
 
 #. item "Man Made/Mineshaft" text "Depth in meters"
 #: build/trans_presets.java:2725
-#, fuzzy
 msgid "Depth in meters"
-msgstr "Paramètres d'action"
+msgstr ""
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
@@ -30651,7 +30640,6 @@
 #. item "Amenities/Clock"
 #: build/trans_presets.java:2825
-#, fuzzy
 msgid "Clock"
-msgstr "Obstacle"
+msgstr ""
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=clock"
@@ -30659,7 +30647,6 @@
 #. item "Amenities/Clock" label "Edit Clock"
 #: build/trans_presets.java:2828
-#, fuzzy
 msgid "Edit Clock"
-msgstr "Modifier un dock"
+msgstr ""
 
 #. <key key="amenity" value="clock" />
@@ -30667,33 +30654,27 @@
 #. item "Amenities/Clock" combo "Display"
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "Display"
-msgstr "lecture"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "analog"
-msgstr "Canal"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "digital"
-msgstr "Modifier une voie ferrée"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "sundial"
-msgstr "sunnisme"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "unorthodox"
-msgstr "orthodoxie"
+msgstr ""
 
 #. item "Amenities/Clock" combo "Support"
 #: build/trans_presets.java:2832
-#, fuzzy
 msgid "Support"
-msgstr "Sports"
+msgstr ""
 
 #: build/trans_presets.java:2832
@@ -30702,18 +30683,15 @@
 
 #: build/trans_presets.java:2832
-#, fuzzy
 msgid "billboard"
-msgstr "Plot"
+msgstr ""
 
 #. item "Amenities/Clock" combo "Visibility/readability"
 #: build/trans_presets.java:2833
-#, fuzzy
 msgid "Visibility/readability"
-msgstr "Visibilité"
+msgstr ""
 
 #: build/trans_presets.java:2833
-#, fuzzy
 msgid "(up to 5m)"
-msgstr "à la tuile"
+msgstr ""
 
 #: build/trans_presets.java:2833
@@ -30727,7 +30705,6 @@
 #. item "Amenities/Clock" check "Shows current date"
 #: build/trans_presets.java:2834
-#, fuzzy
 msgid "Shows current date"
-msgstr "Sauvegarder les données"
+msgstr ""
 
 #. item "Amenities/Clock" check "Shows temperature"
@@ -30743,7 +30720,6 @@
 #. item "Amenities/Clock" check "Shows humidity"
 #: build/trans_presets.java:2837
-#, fuzzy
 msgid "Shows humidity"
-msgstr "Montrer l’historique"
+msgstr ""
 
 #. </optional>
@@ -36808,4 +36784,12 @@
 msgid "PCN 2006 - Italy"
 msgstr "PCN 2006 - Italie"
+
+#.
+#. only for France
+#. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html
+#: build/trans_wms.java:52
+#, fuzzy
+msgid "SPOTMaps (France)"
+msgstr "UTM France (DOM)"
 
 #~ msgid "Move"
@@ -38787,13 +38771,7 @@
 #~ "\n"
 
-#~ msgid "Seamark Editor"
-#~ msgstr "Éditeur Seamark"
-
 #~ msgid "Edit OpenSeaMap"
 #~ msgstr "Éditer OpenSeaMap"
 
-#~ msgid "Get Layers"
-#~ msgstr "Obtenir les calques"
-
 #~ msgid "Add relation"
 #~ msgstr "Ajouter la relation"
Index: /applications/editors/josm/i18n/po/gl.po
===================================================================
--- /applications/editors/josm/i18n/po/gl.po	(revision 23466)
+++ /applications/editors/josm/i18n/po/gl.po	(revision 23467)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-01 19:14+0200\n"
-"PO-Revision-Date: 2010-09-02 21:42+0000\n"
+"POT-Creation-Date: 2010-10-03 22:45+0200\n"
+"PO-Revision-Date: 2010-10-01 20:41+0000\n"
 "Last-Translator: Dario <dario.villar.v@gmail.com>\n"
 "Language-Team: Galician <gl@li.org>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-10-01 16:24+0000\n"
+"X-Launchpad-Export-Date: 2010-10-03 20:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -85,5 +85,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:251
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:515
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:186
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121
@@ -229,5 +229,4 @@
 
 #. Strings in JFileChooser
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
@@ -278,7 +277,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:995
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:992
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119
@@ -303,5 +302,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
-#: build/specialmessages.java:33 build/specialmessages.java:90
+#: build/specialmessages.java:33
 msgid "Cancel"
 msgstr "Cancelar"
@@ -422,5 +421,5 @@
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:42
-#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:40
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -677,5 +676,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:145
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:509
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
@@ -1588,6 +1587,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:112
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:834
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:844
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:831
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:841
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:64
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:78
@@ -1651,5 +1650,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
-#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1327
+#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1340
 #: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1406
 #: build/specialmessages.java:65
@@ -1765,5 +1764,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
-#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1300
+#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1313
 #: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1382
 msgid "Close"
@@ -1816,5 +1815,4 @@
 msgstr "Por favor escolla ao menos unha via para simplificar."
 
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
@@ -1822,5 +1820,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:87
-#: build/specialmessages.java:88
 msgid "Yes"
 msgstr "Sí"
@@ -2561,5 +2558,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:783
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:108
@@ -2996,5 +2993,5 @@
 "uso: clave=valor"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:459
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:449
 #, java-format
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
@@ -3003,36 +3000,36 @@
 "relación"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:641
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:631
 #, java-format
 msgid "Unexpected token. Expected {0}, found {1}"
 msgstr "Elemento non esperado. Esperábase {0} pero atopouse {1}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:656
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:646
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr "Mostra non esperada: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:667
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:657
 msgid "Missing parameter for OR"
 msgstr "Falta un parametro para OU"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:692
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:682
 msgid "Missing operator for NOT"
 msgstr "Falta un parametro para NON"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:699
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:689
 msgid "Primitive id expected"
 msgstr "Esperábase un id primitivo"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:701
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:704
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:691
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:694
 msgid "Range of numbers expected"
 msgstr "Rango de numeros esperado"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:707
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:697
 msgid "Changeset id expected"
 msgstr "Esperabase un id de un conxunto de cambios"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:709
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:699
 msgid "Version expected"
 msgstr "Version esperada"
@@ -3096,5 +3093,4 @@
 
 #. Strings in JFileChooser
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
@@ -3125,5 +3121,5 @@
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:686
-#: build/specialmessages.java:58 build/specialmessages.java:87
+#: build/specialmessages.java:58
 msgid "OK"
 msgstr "OK"
@@ -3751,5 +3747,5 @@
 msgstr "E"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:243
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:258
 #, java-format
 msgid ""
@@ -3759,5 +3755,5 @@
 "incluido"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:651
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:666
 #, java-format
 msgid ""
@@ -4625,5 +4621,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
 msgid "Presets"
@@ -6671,5 +6667,5 @@
 #. item "Highways/Streets/Roundabout" text "Name"
 #. <space />
-#. <key key="bridge" value="yes" />
+#. unparsed line             <combo key="bridge" values="yes,viaduct,swing,aqueduct" required="true" default="yes" text="Bridge" />
 #. <optional>
 #. item "Highways/Streets/Bridge" text "Name"
@@ -7992,5 +7988,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:572
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:639
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:146
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:143
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
 msgid "<different>"
@@ -9432,9 +9428,7 @@
 msgstr ""
 
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
-#: build/specialmessages.java:89
 msgid "No"
 msgstr ""
@@ -12326,5 +12320,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:489
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:512
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:514
 msgid "Please select an entry."
 msgstr "Por favor selecciona unha entrada."
@@ -12745,38 +12739,38 @@
 msgstr "Axustes de etiquetado preestablecidos."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:266
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:270
 msgid "Actions"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:396
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:418
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:400
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:422
 msgid "Separator"
 msgstr "Separador"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:580
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:584
 msgid "Toolbar"
 msgstr "Barra de ferramentas"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:584
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:588
 msgid "Available"
 msgstr "Dispoñible"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:623
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:627
 msgid "Action parameters"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:624
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:628
 msgid "Parameter name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:625
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:629
 msgid "Parameter value"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:630
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:634
 msgid "Toolbar customization"
 msgstr "Personalización de barra de ferramentas"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:631
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:635
 msgid "Customize the elements on the toolbar."
 msgstr "Personalizar os elementos da barra de ferramentas."
@@ -13082,5 +13076,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:384
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:381
 #, java-format
 msgid ""
@@ -13089,49 +13083,49 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:514
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:511
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:314
 msgid "More information about this feature"
 msgstr "Máis información acerca desta característica"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:551
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:548
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:605
+msgid "Available roles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:606
+msgid "role"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607
+msgid "count"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:608
-msgid "Available roles"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:609
-msgid "role"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:610
-msgid "count"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:611
 msgid "elements"
 msgstr ""
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:626
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:623
 msgid "Optional Attributes:"
 msgstr "Atributos Opcionais:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:724
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:721
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Tipo descoñecido: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:792
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:789
 msgid "Preset role element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:800
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:797
 msgid "Preset sub element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:833
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:830
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -13141,15 +13135,15 @@
 msgstr "Non se puido ler a fonte de etiquetado preestablecido: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:843
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:840
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Erro analizando {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:884
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:881
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Os elementos do tipo {0} están soportados."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:980
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:977
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -13159,22 +13153,22 @@
 msgstr[1] "Cambiar {0} obxectos"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:983
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:980
 msgid "Nothing selected!"
 msgstr "Nada seleccionado!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:985
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:982
 msgid "Selection unsuitable!"
 msgstr "Selección non axeitada!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:995
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:992
 msgid "Apply Preset"
 msgstr "Aplicar axuste preestablecido"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
 msgid "New relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1083
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1080
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -13203,9 +13197,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:273
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:278
 msgid "Show only applicable to selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:295
 msgid "Search in tags"
 msgstr ""
@@ -18189,7 +18183,6 @@
 
 #: ../plugins/rgisopen/src/rgisopen/RGISLayerFromFileAction.java:34
-#, fuzzy
 msgid "New picture layer from RGIS..."
-msgstr "Nova capa de imaxe de arquivo..."
+msgstr ""
 
 #: ../plugins/rgisopen/src/rgisopen/RGISOpenPlugin.java:33
@@ -18431,4 +18424,15 @@
 msgstr ""
 
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:40
+#, fuzzy
+msgid "Seamap Editor"
+msgstr "Separador"
+
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#, fuzzy
+msgid "Seanap Editor"
+msgstr "Separador"
+
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:38
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
@@ -20429,5 +20433,5 @@
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:90
 #, java-format
 msgid "{0} {1}% of GPS track"
@@ -20717,6 +20721,7 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88
-msgid "Get Capabilities"
-msgstr ""
+#, fuzzy
+msgid "Get Layers"
+msgstr "Capas"
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124
@@ -20728,10 +20733,7 @@
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:126
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:161
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:236
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:254
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:273
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:277
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:310
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:222
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:244
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:262
 msgid "WMS Error"
 msgstr ""
@@ -20751,17 +20753,14 @@
 msgstr "WMS URL"
 
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:235
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:221
+msgid "Could not parse WMS layer list."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:243
 msgid "Invalid service URL."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:253
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:261
 msgid "Could not retrieve WMS layer list."
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:272
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:276
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:280
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:309
-msgid "Could not parse WMS layer list."
 msgstr ""
 
@@ -23180,7 +23179,6 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. axleload (tonnes)"
 #: build/trans_presets.java:416
-#, fuzzy
 msgid "Max. axleload (tonnes)"
-msgstr "Peso máximo (t)"
+msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
@@ -26033,7 +26031,6 @@
 
 #: build/trans_presets.java:1506
-#, fuzzy
 msgid "used"
-msgstr "uso"
+msgstr ""
 
 #: build/trans_presets.java:1508 build/trans_presets.java:1509
@@ -26042,7 +26039,6 @@
 
 #: build/trans_presets.java:1508 build/trans_presets.java:1509
-#, fuzzy
 msgid "oldtimer"
-msgstr "tigre"
+msgstr ""
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Parts"
@@ -26658,7 +26654,6 @@
 
 #: build/trans_presets.java:1828
-#, fuzzy
 msgid "interval"
-msgstr "industrial"
+msgstr ""
 
 #. item "Travel/Accomodation/Caravan Site" check "Power supply"
@@ -26669,7 +26664,6 @@
 #. item "Travel/Accomodation/Caravan Site" check "Tents allowed"
 #: build/trans_presets.java:1830
-#, fuzzy
 msgid "Tents allowed"
-msgstr "So se permiten dous nodos"
+msgstr ""
 
 #. item "Travel/Accomodation/Camping Site"
@@ -29240,13 +29234,11 @@
 #. item "Man Made/Mineshaft" label "Edit Mineshaft"
 #: build/trans_presets.java:2722
-#, fuzzy
 msgid "Edit Mineshaft"
-msgstr "Editar porto deportivo"
+msgstr ""
 
 #. item "Man Made/Mineshaft" text "Depth in meters"
 #: build/trans_presets.java:2725
-#, fuzzy
 msgid "Depth in meters"
-msgstr "Anchura (metros)"
+msgstr ""
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
@@ -29512,7 +29504,6 @@
 #. item "Amenities/Clock"
 #: build/trans_presets.java:2825
-#, fuzzy
 msgid "Clock"
-msgstr "Bloque"
+msgstr ""
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=clock"
@@ -29520,7 +29511,6 @@
 #. item "Amenities/Clock" label "Edit Clock"
 #: build/trans_presets.java:2828
-#, fuzzy
 msgid "Edit Clock"
-msgstr "Editar un muelle"
+msgstr ""
 
 #. <key key="amenity" value="clock" />
@@ -29528,33 +29518,27 @@
 #. item "Amenities/Clock" combo "Display"
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "Display"
-msgstr "illa"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "analog"
-msgstr "Canal"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "digital"
-msgstr "Ediar vía de tren"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "sundial"
-msgstr "suní"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "unorthodox"
-msgstr "ortodoxo"
+msgstr ""
 
 #. item "Amenities/Clock" combo "Support"
 #: build/trans_presets.java:2832
-#, fuzzy
 msgid "Support"
-msgstr "Deportes"
+msgstr ""
 
 #: build/trans_presets.java:2832
@@ -29563,7 +29547,6 @@
 
 #: build/trans_presets.java:2832
-#, fuzzy
 msgid "billboard"
-msgstr "Bolardo"
+msgstr ""
 
 #. item "Amenities/Clock" combo "Visibility/readability"
@@ -29573,7 +29556,6 @@
 
 #: build/trans_presets.java:2833
-#, fuzzy
 msgid "(up to 5m)"
-msgstr "ata a tesela"
+msgstr ""
 
 #: build/trans_presets.java:2833
@@ -29587,7 +29569,6 @@
 #. item "Amenities/Clock" check "Shows current date"
 #: build/trans_presets.java:2834
-#, fuzzy
 msgid "Shows current date"
-msgstr "Gardar os datos actuais."
+msgstr ""
 
 #. item "Amenities/Clock" check "Shows temperature"
@@ -29603,7 +29584,6 @@
 #. item "Amenities/Clock" check "Shows humidity"
 #: build/trans_presets.java:2837
-#, fuzzy
 msgid "Shows humidity"
-msgstr "Amosar historia"
+msgstr ""
 
 #. </optional>
@@ -35669,4 +35649,11 @@
 msgstr ""
 
+#.
+#. only for France
+#. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html
+#: build/trans_wms.java:52
+msgid "SPOTMaps (France)"
+msgstr ""
+
 #~ msgid "Be sure to include the following information:"
 #~ msgstr "Asegúrate de incluir a seguinte información:"
Index: /applications/editors/josm/i18n/po/he.po
===================================================================
--- /applications/editors/josm/i18n/po/he.po	(revision 23466)
+++ /applications/editors/josm/i18n/po/he.po	(revision 23467)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-01 19:14+0200\n"
-"PO-Revision-Date: 2010-09-25 12:51+0000\n"
+"POT-Creation-Date: 2010-10-03 22:45+0200\n"
+"PO-Revision-Date: 2010-10-01 20:12+0000\n"
 "Last-Translator: bastik <Unknown>\n"
 "Language-Team: Hebrew <he@li.org>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-10-01 16:26+0000\n"
+"X-Launchpad-Export-Date: 2010-10-03 20:34+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -85,5 +85,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:251
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:515
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:186
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121
@@ -228,5 +228,4 @@
 
 #. Strings in JFileChooser
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
@@ -277,7 +276,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:995
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:992
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119
@@ -302,5 +301,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
-#: build/specialmessages.java:33 build/specialmessages.java:90
+#: build/specialmessages.java:33
 msgid "Cancel"
 msgstr "ביטול"
@@ -420,5 +419,5 @@
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:42
-#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:40
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -670,5 +669,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:145
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:509
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
@@ -1546,6 +1545,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:112
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:834
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:844
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:831
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:841
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:64
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:78
@@ -1609,5 +1608,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
-#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1327
+#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1340
 #: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1406
 #: build/specialmessages.java:65
@@ -1720,5 +1719,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
-#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1300
+#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1313
 #: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1382
 msgid "Close"
@@ -1771,5 +1770,4 @@
 msgstr "בחר לפחות דרך אחת לפישוט"
 
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
@@ -1777,5 +1775,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:87
-#: build/specialmessages.java:88
 msgid "Yes"
 msgstr "כן"
@@ -2481,5 +2478,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:783
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:108
@@ -2886,41 +2883,41 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:459
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:449
 #, java-format
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:641
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:631
 #, java-format
 msgid "Unexpected token. Expected {0}, found {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:656
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:646
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:667
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:657
 msgid "Missing parameter for OR"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:692
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:682
 msgid "Missing operator for NOT"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:689
+msgid "Primitive id expected"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:691
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:694
+msgid "Range of numbers expected"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:697
+msgid "Changeset id expected"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:699
-msgid "Primitive id expected"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:701
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:704
-msgid "Range of numbers expected"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:707
-msgid "Changeset id expected"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:709
 msgid "Version expected"
 msgstr ""
@@ -2977,5 +2974,4 @@
 
 #. Strings in JFileChooser
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
@@ -3006,5 +3002,5 @@
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:686
-#: build/specialmessages.java:58 build/specialmessages.java:87
+#: build/specialmessages.java:58
 msgid "OK"
 msgstr "אישור"
@@ -3599,5 +3595,5 @@
 msgstr "מזרח"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:243
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:258
 #, java-format
 msgid ""
@@ -3605,5 +3601,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:651
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:666
 #, java-format
 msgid ""
@@ -4445,5 +4441,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
 msgid "Presets"
@@ -6391,5 +6387,5 @@
 #. item "Highways/Streets/Roundabout" text "Name"
 #. <space />
-#. <key key="bridge" value="yes" />
+#. unparsed line             <combo key="bridge" values="yes,viaduct,swing,aqueduct" required="true" default="yes" text="Bridge" />
 #. <optional>
 #. item "Highways/Streets/Bridge" text "Name"
@@ -7684,5 +7680,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:572
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:639
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:146
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:143
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
 msgid "<different>"
@@ -9096,9 +9092,7 @@
 msgstr ""
 
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
-#: build/specialmessages.java:89
 msgid "No"
 msgstr ""
@@ -11951,5 +11945,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:489
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:512
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:514
 msgid "Please select an entry."
 msgstr "בחר כניסה."
@@ -12366,38 +12360,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:266
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:270
 msgid "Actions"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:396
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:418
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:400
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:422
 msgid "Separator"
 msgstr "מפריד"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:580
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:584
 msgid "Toolbar"
 msgstr "סרגל כלים"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:584
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:588
 msgid "Available"
 msgstr "זמין"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:623
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:627
 msgid "Action parameters"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:624
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:628
 msgid "Parameter name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:625
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:629
 msgid "Parameter value"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:630
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:634
 msgid "Toolbar customization"
 msgstr "התאמת סרגל כלים"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:631
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:635
 msgid "Customize the elements on the toolbar."
 msgstr "התאם את האלמנטים בסרגל הכלים."
@@ -12703,5 +12697,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:384
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:381
 #, java-format
 msgid ""
@@ -12710,49 +12704,49 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:514
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:511
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:314
 msgid "More information about this feature"
 msgstr "עוד מידע על הכלי הזה"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:551
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:548
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:605
+msgid "Available roles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:606
+msgid "role"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607
+msgid "count"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:608
-msgid "Available roles"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:609
-msgid "role"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:610
-msgid "count"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:611
 msgid "elements"
 msgstr ""
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:626
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:623
 msgid "Optional Attributes:"
 msgstr "מאפייני רשות:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:724
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:721
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "סוג לא ידוע: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:792
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:789
 msgid "Preset role element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:800
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:797
 msgid "Preset sub element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:833
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:830
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -12762,15 +12756,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:843
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:840
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "שגיאה בניתוח {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:884
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:881
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:980
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:977
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -12780,22 +12774,22 @@
 msgstr[1] "שנה {0} עצמים"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:983
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:980
 msgid "Nothing selected!"
 msgstr "כלום לא נבחר!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:985
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:982
 msgid "Selection unsuitable!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:995
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:992
 msgid "Apply Preset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
 msgid "New relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1083
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1080
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -12824,9 +12818,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:273
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:278
 msgid "Show only applicable to selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:295
 msgid "Search in tags"
 msgstr ""
@@ -17956,4 +17950,15 @@
 msgstr ""
 
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:40
+#, fuzzy
+msgid "Seamap Editor"
+msgstr "מפריד"
+
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#, fuzzy
+msgid "Seanap Editor"
+msgstr "מפריד"
+
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:38
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
@@ -19934,5 +19939,5 @@
 msgstr "{0},..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:90
 #, java-format
 msgid "{0} {1}% of GPS track"
@@ -20222,6 +20227,7 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88
-msgid "Get Capabilities"
-msgstr ""
+#, fuzzy
+msgid "Get Layers"
+msgstr "שכבות"
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124
@@ -20233,10 +20239,7 @@
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:126
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:161
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:236
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:254
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:273
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:277
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:310
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:222
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:244
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:262
 msgid "WMS Error"
 msgstr ""
@@ -20256,17 +20259,14 @@
 msgstr "כתובת WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:235
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:221
+msgid "Could not parse WMS layer list."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:243
 msgid "Invalid service URL."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:253
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:261
 msgid "Could not retrieve WMS layer list."
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:272
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:276
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:280
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:309
-msgid "Could not parse WMS layer list."
 msgstr ""
 
@@ -22635,7 +22635,6 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. axleload (tonnes)"
 #: build/trans_presets.java:416
-#, fuzzy
 msgid "Max. axleload (tonnes)"
-msgstr "משקל מירבי (טונות)"
+msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
@@ -25488,7 +25487,6 @@
 
 #: build/trans_presets.java:1506
-#, fuzzy
 msgid "used"
-msgstr "שימוש"
+msgstr ""
 
 #: build/trans_presets.java:1508 build/trans_presets.java:1509
@@ -26112,7 +26110,6 @@
 
 #: build/trans_presets.java:1828
-#, fuzzy
 msgid "interval"
-msgstr "תעשייתי"
+msgstr ""
 
 #. item "Travel/Accomodation/Caravan Site" check "Power supply"
@@ -26123,7 +26120,6 @@
 #. item "Travel/Accomodation/Caravan Site" check "Tents allowed"
 #: build/trans_presets.java:1830
-#, fuzzy
 msgid "Tents allowed"
-msgstr "מותרות רק שתי נקודות"
+msgstr ""
 
 #. item "Travel/Accomodation/Camping Site"
@@ -28694,7 +28690,6 @@
 #. item "Man Made/Mineshaft" label "Edit Mineshaft"
 #: build/trans_presets.java:2722
-#, fuzzy
 msgid "Edit Mineshaft"
-msgstr "ערוך קולנוע"
+msgstr ""
 
 #. item "Man Made/Mineshaft" text "Depth in meters"
@@ -28965,7 +28960,6 @@
 #. item "Amenities/Clock"
 #: build/trans_presets.java:2825
-#, fuzzy
 msgid "Clock"
-msgstr "מחסום"
+msgstr ""
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=clock"
@@ -28973,7 +28967,6 @@
 #. item "Amenities/Clock" label "Edit Clock"
 #: build/trans_presets.java:2828
-#, fuzzy
 msgid "Edit Clock"
-msgstr "ערוך הוקי"
+msgstr ""
 
 #. <key key="amenity" value="clock" />
@@ -28981,33 +28974,27 @@
 #. item "Amenities/Clock" combo "Display"
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "Display"
-msgstr "אי"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "analog"
-msgstr "תעלה"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "digital"
-msgstr "ערוך בית חולים"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "sundial"
-msgstr "סוני"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "unorthodox"
-msgstr "אורתודוקסי"
+msgstr ""
 
 #. item "Amenities/Clock" combo "Support"
 #: build/trans_presets.java:2832
-#, fuzzy
 msgid "Support"
-msgstr "ספורט"
+msgstr ""
 
 #: build/trans_presets.java:2832
@@ -29038,7 +29025,6 @@
 #. item "Amenities/Clock" check "Shows current date"
 #: build/trans_presets.java:2834
-#, fuzzy
 msgid "Shows current date"
-msgstr "שמור את הנתונים הנוכחיים."
+msgstr ""
 
 #. item "Amenities/Clock" check "Shows temperature"
@@ -35119,4 +35105,11 @@
 msgstr ""
 
+#.
+#. only for France
+#. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html
+#: build/trans_wms.java:52
+msgid "SPOTMaps (France)"
+msgstr ""
+
 #~ msgid "Move"
 #~ msgstr "הזז"
Index: /applications/editors/josm/i18n/po/is.po
===================================================================
--- /applications/editors/josm/i18n/po/is.po	(revision 23466)
+++ /applications/editors/josm/i18n/po/is.po	(revision 23467)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-01 19:14+0200\n"
+"POT-Creation-Date: 2010-10-03 22:45+0200\n"
 "PO-Revision-Date: 2010-09-06 01:20+0000\n"
 "Last-Translator: Ævar Arnfjörð Bjarmason <avarab@gmail.com>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-10-01 16:25+0000\n"
+"X-Launchpad-Export-Date: 2010-10-03 20:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -85,5 +85,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:251
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:515
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:186
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121
@@ -222,5 +222,4 @@
 
 #. Strings in JFileChooser
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
@@ -271,7 +270,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:995
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:992
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119
@@ -296,5 +295,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
-#: build/specialmessages.java:33 build/specialmessages.java:90
+#: build/specialmessages.java:33
 msgid "Cancel"
 msgstr "Hætta við"
@@ -415,5 +414,5 @@
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:42
-#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:40
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -668,5 +667,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:145
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:509
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
@@ -1542,6 +1541,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:112
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:834
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:844
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:831
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:841
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:64
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:78
@@ -1605,5 +1604,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
-#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1327
+#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1340
 #: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1406
 #: build/specialmessages.java:65
@@ -1715,5 +1714,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
-#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1300
+#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1313
 #: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1382
 msgid "Close"
@@ -1766,5 +1765,4 @@
 msgstr "Veldu í það minnsta einn veg til að einfalda."
 
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
@@ -1772,5 +1770,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:87
-#: build/specialmessages.java:88
 msgid "Yes"
 msgstr "Já"
@@ -2480,5 +2477,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:783
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:108
@@ -2886,5 +2883,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:459
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:449
 #, java-format
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
@@ -2893,36 +2890,36 @@
 "hnút, veg og vensl"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:641
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:631
 #, java-format
 msgid "Unexpected token. Expected {0}, found {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:656
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:646
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:667
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:657
 msgid "Missing parameter for OR"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:692
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:682
 msgid "Missing operator for NOT"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:689
+msgid "Primitive id expected"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:691
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:694
+msgid "Range of numbers expected"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:697
+msgid "Changeset id expected"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:699
-msgid "Primitive id expected"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:701
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:704
-msgid "Range of numbers expected"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:707
-msgid "Changeset id expected"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:709
 msgid "Version expected"
 msgstr ""
@@ -2979,5 +2976,4 @@
 
 #. Strings in JFileChooser
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
@@ -3008,5 +3004,5 @@
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:686
-#: build/specialmessages.java:58 build/specialmessages.java:87
+#: build/specialmessages.java:58
 msgid "OK"
 msgstr "Í lagi"
@@ -3602,5 +3598,5 @@
 msgstr "A"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:243
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:258
 #, java-format
 msgid ""
@@ -3608,5 +3604,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:651
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:666
 #, java-format
 msgid ""
@@ -4442,5 +4438,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
 msgid "Presets"
@@ -6382,5 +6378,5 @@
 #. item "Highways/Streets/Roundabout" text "Name"
 #. <space />
-#. <key key="bridge" value="yes" />
+#. unparsed line             <combo key="bridge" values="yes,viaduct,swing,aqueduct" required="true" default="yes" text="Bridge" />
 #. <optional>
 #. item "Highways/Streets/Bridge" text "Name"
@@ -7675,5 +7671,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:572
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:639
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:146
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:143
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
 msgid "<different>"
@@ -9095,9 +9091,7 @@
 msgstr "Velja skráarnafn"
 
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
-#: build/specialmessages.java:89
 msgid "No"
 msgstr ""
@@ -11944,5 +11938,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:489
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:512
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:514
 msgid "Please select an entry."
 msgstr "Vinsamlegast veldu viðbótarþjón til að fjarlægja."
@@ -12360,38 +12354,38 @@
 msgstr "Forstillingar"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:266
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:270
 msgid "Actions"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:396
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:418
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:400
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:422
 msgid "Separator"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:580
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:584
 msgid "Toolbar"
 msgstr "Tækjaslá"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:584
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:588
 msgid "Available"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:623
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:627
 msgid "Action parameters"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:624
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:628
 msgid "Parameter name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:625
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:629
 msgid "Parameter value"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:630
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:634
 msgid "Toolbar customization"
 msgstr "Tækjaslá"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:631
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:635
 msgid "Customize the elements on the toolbar."
 msgstr "Breyta íhlutum tækjasláarinnar"
@@ -12697,5 +12691,5 @@
 msgstr "Bæta við nýju taggi"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:384
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:381
 #, java-format
 msgid ""
@@ -12704,49 +12698,49 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:514
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:511
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:314
 msgid "More information about this feature"
 msgstr "Frekari upplýsingar um þessa forstillingu"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:551
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:548
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:605
+msgid "Available roles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:606
+msgid "role"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607
+msgid "count"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:608
-msgid "Available roles"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:609
-msgid "role"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:610
-msgid "count"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:611
 msgid "elements"
 msgstr ""
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:626
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:623
 msgid "Optional Attributes:"
 msgstr "Valfrjáls eigind:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:724
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:721
 #, java-format
 msgid "Unknown type: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:792
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:789
 msgid "Preset role element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:800
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:797
 msgid "Preset sub element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:833
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:830
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -12756,15 +12750,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:843
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:840
 #, java-format
 msgid "Error parsing {0}: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:884
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:881
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:980
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:977
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -12774,22 +12768,22 @@
 msgstr[1] "Breyta {0} hlutum"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:983
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:980
 msgid "Nothing selected!"
 msgstr "Ekkert er valið!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:985
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:982
 msgid "Selection unsuitable!"
 msgstr "Val óhæfilegt!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:995
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:992
 msgid "Apply Preset"
 msgstr "Vista forstillingu"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
 msgid "New relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1083
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1080
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -12818,9 +12812,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:273
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:278
 msgid "Show only applicable to selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:295
 msgid "Search in tags"
 msgstr ""
@@ -17943,4 +17937,13 @@
 msgstr ""
 
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:40
+msgid "Seamap Editor"
+msgstr ""
+
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+msgid "Seanap Editor"
+msgstr ""
+
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:38
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
@@ -19917,5 +19920,5 @@
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:90
 #, java-format
 msgid "{0} {1}% of GPS track"
@@ -20205,6 +20208,7 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88
-msgid "Get Capabilities"
-msgstr ""
+#, fuzzy
+msgid "Get Layers"
+msgstr "Lög"
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124
@@ -20216,10 +20220,7 @@
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:126
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:161
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:236
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:254
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:273
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:277
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:310
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:222
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:244
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:262
 msgid "WMS Error"
 msgstr ""
@@ -20239,17 +20240,14 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:235
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:221
+msgid "Could not parse WMS layer list."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:243
 msgid "Invalid service URL."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:253
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:261
 msgid "Could not retrieve WMS layer list."
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:272
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:276
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:280
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:309
-msgid "Could not parse WMS layer list."
 msgstr ""
 
@@ -22616,7 +22614,6 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. axleload (tonnes)"
 #: build/trans_presets.java:416
-#, fuzzy
 msgid "Max. axleload (tonnes)"
-msgstr "Hámarksþyngt (í tonnum)"
+msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
@@ -25469,7 +25466,6 @@
 
 #: build/trans_presets.java:1506
-#, fuzzy
 msgid "used"
-msgstr "Safn"
+msgstr ""
 
 #: build/trans_presets.java:1508 build/trans_presets.java:1509
@@ -26093,7 +26089,6 @@
 
 #: build/trans_presets.java:1828
-#, fuzzy
 msgid "interval"
-msgstr "iðnaður"
+msgstr ""
 
 #. item "Travel/Accomodation/Caravan Site" check "Power supply"
@@ -26104,7 +26099,6 @@
 #. item "Travel/Accomodation/Caravan Site" check "Tents allowed"
 #: build/trans_presets.java:1830
-#, fuzzy
 msgid "Tents allowed"
-msgstr "Aðeins er hægt að velja tvo hnúta"
+msgstr ""
 
 #. item "Travel/Accomodation/Camping Site"
@@ -28675,13 +28669,11 @@
 #. item "Man Made/Mineshaft" label "Edit Mineshaft"
 #: build/trans_presets.java:2722
-#, fuzzy
 msgid "Edit Mineshaft"
-msgstr "Breyti smábátahöfn"
+msgstr ""
 
 #. item "Man Made/Mineshaft" text "Depth in meters"
 #: build/trans_presets.java:2725
-#, fuzzy
 msgid "Depth in meters"
-msgstr "Breidd (í metrum)"
+msgstr ""
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
@@ -28947,7 +28939,6 @@
 #. item "Amenities/Clock"
 #: build/trans_presets.java:2825
-#, fuzzy
 msgid "Clock"
-msgstr "Skipakví"
+msgstr ""
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=clock"
@@ -28955,7 +28946,6 @@
 #. item "Amenities/Clock" label "Edit Clock"
 #: build/trans_presets.java:2828
-#, fuzzy
 msgid "Edit Clock"
-msgstr "Breyti skipakví"
+msgstr ""
 
 #. <key key="amenity" value="clock" />
@@ -28963,22 +28953,18 @@
 #. item "Amenities/Clock" combo "Display"
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "Display"
-msgstr "eyja"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "analog"
-msgstr "Skipaskurður"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "digital"
-msgstr "Breyti spítala"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "sundial"
-msgstr "indversk"
+msgstr ""
 
 #: build/trans_presets.java:2831
@@ -28988,7 +28974,6 @@
 #. item "Amenities/Clock" combo "Support"
 #: build/trans_presets.java:2832
-#, fuzzy
 msgid "Support"
-msgstr "Íþróttir"
+msgstr ""
 
 #: build/trans_presets.java:2832
@@ -29019,7 +29004,6 @@
 #. item "Amenities/Clock" check "Shows current date"
 #: build/trans_presets.java:2834
-#, fuzzy
 msgid "Shows current date"
-msgstr "Vista þau gögn sem sjást núna."
+msgstr ""
 
 #. item "Amenities/Clock" check "Shows temperature"
@@ -35100,4 +35084,11 @@
 msgstr ""
 
+#.
+#. only for France
+#. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html
+#: build/trans_wms.java:52
+msgid "SPOTMaps (France)"
+msgstr ""
+
 #~ msgid "Incorrect password or username."
 #~ msgstr "Rangt lykilorð eða notandanafn"
Index: /applications/editors/josm/i18n/po/it.po
===================================================================
--- /applications/editors/josm/i18n/po/it.po	(revision 23466)
+++ /applications/editors/josm/i18n/po/it.po	(revision 23467)
@@ -5,6 +5,6 @@
 "Project-Id-Version: josm 20081003\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-01 19:14+0200\n"
-"PO-Revision-Date: 2010-09-27 09:22+0000\n"
+"POT-Creation-Date: 2010-10-03 22:45+0200\n"
+"PO-Revision-Date: 2010-10-01 20:29+0000\n"
 "Last-Translator: Davide Prade <davalv@alice.it>\n"
 "Language-Team: Italian <talk-it@lists.openstreetmap.org>\n"
@@ -13,5 +13,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-10-01 16:27+0000\n"
+"X-Launchpad-Export-Date: 2010-10-03 20:35+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -82,5 +82,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:251
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:515
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:186
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121
@@ -228,5 +228,4 @@
 
 #. Strings in JFileChooser
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
@@ -277,7 +276,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:995
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:992
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119
@@ -302,5 +301,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
-#: build/specialmessages.java:33 build/specialmessages.java:90
+#: build/specialmessages.java:33
 msgid "Cancel"
 msgstr "Annulla"
@@ -421,5 +420,5 @@
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:42
-#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:40
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -677,5 +676,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:145
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:509
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
@@ -1609,6 +1608,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:112
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:834
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:844
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:831
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:841
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:64
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:78
@@ -1672,5 +1671,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
-#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1327
+#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1340
 #: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1406
 #: build/specialmessages.java:65
@@ -1786,5 +1785,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
-#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1300
+#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1313
 #: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1382
 msgid "Close"
@@ -1837,5 +1836,4 @@
 msgstr "Selezionare almeno un percorso da semplificare."
 
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
@@ -1843,5 +1841,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:87
-#: build/specialmessages.java:88
 msgid "Yes"
 msgstr "Si"
@@ -2604,5 +2601,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:783
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:108
@@ -3058,5 +3055,5 @@
 "etichetta. Esempio di utilizzo: key=value"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:459
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:449
 #, java-format
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
@@ -3065,36 +3062,36 @@
 "relazione"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:641
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:631
 #, java-format
 msgid "Unexpected token. Expected {0}, found {1}"
 msgstr "Token inaspettato. Era atteso {0}, trovato {1}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:656
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:646
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr "Token inaspettato: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:667
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:657
 msgid "Missing parameter for OR"
 msgstr "Parametro mancante per OR"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:692
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:682
 msgid "Missing operator for NOT"
 msgstr "Operatore mancante per NOT"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:699
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:689
 msgid "Primitive id expected"
 msgstr "Era atteso un identificativo di primitiva"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:701
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:704
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:691
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:694
 msgid "Range of numbers expected"
 msgstr "Atteso intervallo di numeri"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:707
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:697
 msgid "Changeset id expected"
 msgstr "Era atteso un identificativo del gruppo di modifiche"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:709
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:699
 msgid "Version expected"
 msgstr "Era attesa una versione"
@@ -3160,5 +3157,4 @@
 
 #. Strings in JFileChooser
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
@@ -3189,5 +3185,5 @@
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:686
-#: build/specialmessages.java:58 build/specialmessages.java:87
+#: build/specialmessages.java:58
 msgid "OK"
 msgstr "OK"
@@ -3823,5 +3819,5 @@
 msgstr "E"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:243
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:258
 #, java-format
 msgid ""
@@ -3831,5 +3827,5 @@
 "incluso"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:651
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:666
 #, java-format
 msgid ""
@@ -4716,5 +4712,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
 msgid "Presets"
@@ -6796,5 +6792,5 @@
 #. item "Highways/Streets/Roundabout" text "Name"
 #. <space />
-#. <key key="bridge" value="yes" />
+#. unparsed line             <combo key="bridge" values="yes,viaduct,swing,aqueduct" required="true" default="yes" text="Bridge" />
 #. <optional>
 #. item "Highways/Streets/Bridge" text "Name"
@@ -8151,5 +8147,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:572
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:639
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:146
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:143
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
 msgid "<different>"
@@ -9724,9 +9720,7 @@
 msgstr "Seleziona il nome del file"
 
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
-#: build/specialmessages.java:89
 msgid "No"
 msgstr "No"
@@ -12904,5 +12898,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:489
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:512
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:514
 msgid "Please select an entry."
 msgstr "Seleziona una voce."
@@ -13376,38 +13370,38 @@
 msgstr "Etichette preimpostate"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:266
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:270
 msgid "Actions"
 msgstr "Azioni"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:396
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:418
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:400
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:422
 msgid "Separator"
 msgstr "Separatore"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:580
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:584
 msgid "Toolbar"
 msgstr "Barra degli strumenti"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:584
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:588
 msgid "Available"
 msgstr "Disponibile"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:623
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:627
 msgid "Action parameters"
 msgstr "Parametri dell''azione"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:624
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:628
 msgid "Parameter name"
 msgstr "Nome parametro"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:625
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:629
 msgid "Parameter value"
 msgstr "Valore parametro"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:630
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:634
 msgid "Toolbar customization"
 msgstr "Personalizzazione barra degli strumenti"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:631
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:635
 msgid "Customize the elements on the toolbar."
 msgstr "Personalizza gli elementi nella barra degli strumenti"
@@ -13771,5 +13765,5 @@
 msgstr "Aggiungi una nuova etichetta"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:384
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:381
 #, java-format
 msgid ""
@@ -13780,49 +13774,49 @@
 "display_values deve essere lo stesso di values"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:514
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:511
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:314
 msgid "More information about this feature"
 msgstr "Ulteriori informazioni su questa caratteristica"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:551
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:548
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr "Requisito sconosciuto: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:608
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:605
 msgid "Available roles"
 msgstr "Ruoli disponibili"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:609
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:606
 msgid "role"
 msgstr "ruolo"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:610
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607
 msgid "count"
 msgstr "conteggio"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:611
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:608
 msgid "elements"
 msgstr "elementi"
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:626
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:623
 msgid "Optional Attributes:"
 msgstr "Attributi opzionali:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:724
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:721
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Tipo sconosciuto: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:792
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:789
 msgid "Preset role element without parent"
 msgstr "Elemento ruolo preimpostato senza genitori"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:800
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:797
 msgid "Preset sub element without parent"
 msgstr "Sotto-elemento preimpostato senza genitori"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:833
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:830
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -13832,15 +13826,15 @@
 msgstr "Impossibile leggere la lista delle etichette preimpostate: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:843
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:840
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Impossibile leggere {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:884
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:881
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Sono supportati elementi di tipo {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:980
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:977
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -13850,22 +13844,22 @@
 msgstr[1] "Modifica {0} oggetti"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:983
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:980
 msgid "Nothing selected!"
 msgstr "Non è stato selezionato niente!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:985
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:982
 msgid "Selection unsuitable!"
 msgstr "Selezione non adatta!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:995
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:992
 msgid "Apply Preset"
 msgstr "Applica preimpostazione"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
 msgid "New relation"
 msgstr "Nuova relazione"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1083
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1080
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -13894,9 +13888,9 @@
 msgstr "Ricerca preimpostazioni"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:273
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:278
 msgid "Show only applicable to selection"
 msgstr "Visualizza solamente per la selezione"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:295
 msgid "Search in tags"
 msgstr "Cerca nelle etichette"
@@ -19315,7 +19309,6 @@
 
 #: ../plugins/rgisopen/src/rgisopen/RGISLayerFromFileAction.java:34
-#, fuzzy
 msgid "New picture layer from RGIS..."
-msgstr "Nuovo livello immagine da file..."
+msgstr ""
 
 #: ../plugins/rgisopen/src/rgisopen/RGISOpenPlugin.java:33
@@ -19557,4 +19550,15 @@
 msgid "Fade background: "
 msgstr "Smorza lo sfondo: "
+
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:40
+#, fuzzy
+msgid "Seamap Editor"
+msgstr "Editor delle caratteristiche nautiche"
+
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#, fuzzy
+msgid "Seanap Editor"
+msgstr "Editor delle caratteristiche nautiche"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:38
@@ -21694,5 +21698,5 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:90
 #, java-format
 msgid "{0} {1}% of GPS track"
@@ -22002,6 +22006,6 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88
-msgid "Get Capabilities"
-msgstr "Recupera funzionalità"
+msgid "Get Layers"
+msgstr "Ottieni i livelli"
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124
@@ -22016,10 +22020,7 @@
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:126
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:161
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:236
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:254
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:273
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:277
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:310
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:222
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:244
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:262
 msgid "WMS Error"
 msgstr "Errore WMS"
@@ -22039,18 +22040,15 @@
 msgstr "URL WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:235
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:221
+msgid "Could not parse WMS layer list."
+msgstr "Impossibile analizzare la lista dei livelli WMS."
+
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:243
 msgid "Invalid service URL."
 msgstr "Indirizzo URL del servizio non valido."
 
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:253
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:261
 msgid "Could not retrieve WMS layer list."
 msgstr "Impossibile ottenere la lista dei livelli WMS."
-
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:272
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:276
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:280
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:309
-msgid "Could not parse WMS layer list."
-msgstr "Impossibile analizzare la lista dei livelli WMS."
 
 #: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:76
@@ -23636,7 +23634,6 @@
 #: build/trans_presets.java:588 build/trans_presets.java:611
 #: build/trans_presets.java:630 build/trans_presets.java:651
-#, fuzzy
 msgid "Lit"
-msgstr "Elenco"
+msgstr ""
 
 #. </optional>
@@ -24538,7 +24535,6 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. axleload (tonnes)"
 #: build/trans_presets.java:416
-#, fuzzy
 msgid "Max. axleload (tonnes)"
-msgstr "Peso massimo (tonnellate)"
+msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
@@ -27391,7 +27387,6 @@
 
 #: build/trans_presets.java:1506
-#, fuzzy
 msgid "used"
-msgstr "inutilizzato"
+msgstr ""
 
 #: build/trans_presets.java:1508 build/trans_presets.java:1509
@@ -27400,7 +27395,6 @@
 
 #: build/trans_presets.java:1508 build/trans_presets.java:1509
-#, fuzzy
 msgid "oldtimer"
-msgstr "cartella"
+msgstr ""
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Parts"
@@ -28012,12 +28006,10 @@
 #. item "Travel/Accomodation/Caravan Site" combo "Requires a fee"
 #: build/trans_presets.java:1828
-#, fuzzy
 msgid "Requires a fee"
-msgstr "Richiesta fallita"
+msgstr ""
 
 #: build/trans_presets.java:1828
-#, fuzzy
 msgid "interval"
-msgstr "industriale"
+msgstr ""
 
 #. item "Travel/Accomodation/Caravan Site" check "Power supply"
@@ -28028,7 +28020,6 @@
 #. item "Travel/Accomodation/Caravan Site" check "Tents allowed"
 #: build/trans_presets.java:1830
-#, fuzzy
 msgid "Tents allowed"
-msgstr "Test fallito"
+msgstr ""
 
 #. item "Travel/Accomodation/Camping Site"
@@ -30599,13 +30590,11 @@
 #. item "Man Made/Mineshaft" label "Edit Mineshaft"
 #: build/trans_presets.java:2722
-#, fuzzy
 msgid "Edit Mineshaft"
-msgstr "Modifica un porto turistico"
+msgstr ""
 
 #. item "Man Made/Mineshaft" text "Depth in meters"
 #: build/trans_presets.java:2725
-#, fuzzy
 msgid "Depth in meters"
-msgstr "Parametri dell''azione"
+msgstr ""
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
@@ -30871,7 +30860,6 @@
 #. item "Amenities/Clock"
 #: build/trans_presets.java:2825
-#, fuzzy
 msgid "Clock"
-msgstr "Blocco"
+msgstr ""
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=clock"
@@ -30879,7 +30867,6 @@
 #. item "Amenities/Clock" label "Edit Clock"
 #: build/trans_presets.java:2828
-#, fuzzy
 msgid "Edit Clock"
-msgstr "Modifica una darsena/bacino navale"
+msgstr ""
 
 #. <key key="amenity" value="clock" />
@@ -30887,33 +30874,27 @@
 #. item "Amenities/Clock" combo "Display"
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "Display"
-msgstr "riproduci"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "analog"
-msgstr "Canale"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "digital"
-msgstr "Modifica una ferrovia"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "sundial"
-msgstr "Sunnita"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "unorthodox"
-msgstr "Ortodossa"
+msgstr ""
 
 #. item "Amenities/Clock" combo "Support"
 #: build/trans_presets.java:2832
-#, fuzzy
 msgid "Support"
-msgstr "Discipline sportive"
+msgstr ""
 
 #: build/trans_presets.java:2832
@@ -30922,18 +30903,15 @@
 
 #: build/trans_presets.java:2832
-#, fuzzy
 msgid "billboard"
-msgstr "Colonnina"
+msgstr ""
 
 #. item "Amenities/Clock" combo "Visibility/readability"
 #: build/trans_presets.java:2833
-#, fuzzy
 msgid "Visibility/readability"
-msgstr "Visibilità"
+msgstr ""
 
 #: build/trans_presets.java:2833
-#, fuzzy
 msgid "(up to 5m)"
-msgstr "fino al tassello"
+msgstr ""
 
 #: build/trans_presets.java:2833
@@ -30947,7 +30925,6 @@
 #. item "Amenities/Clock" check "Shows current date"
 #: build/trans_presets.java:2834
-#, fuzzy
 msgid "Shows current date"
-msgstr "Salva i dati attuali."
+msgstr ""
 
 #. item "Amenities/Clock" check "Shows temperature"
@@ -30963,7 +30940,6 @@
 #. item "Amenities/Clock" check "Shows humidity"
 #: build/trans_presets.java:2837
-#, fuzzy
 msgid "Shows humidity"
-msgstr "Visualizza storico"
+msgstr ""
 
 #. </optional>
@@ -37030,6 +37006,14 @@
 msgstr "PCN 2006 - Italia"
 
-#~ msgid "Plugin for Seamap Editor"
-#~ msgstr "Estensione per la modifica di mappe nautiche"
+#.
+#. only for France
+#. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html
+#: build/trans_wms.java:52
+#, fuzzy
+msgid "SPOTMaps (France)"
+msgstr "UTM Francia (DOM)"
+
+#~ msgid "Get Capabilities"
+#~ msgstr "Recupera funzionalità"
 
 #~ msgid "No data imported."
@@ -39357,7 +39341,4 @@
 #~ msgstr "Nautica"
 
-#~ msgid "Seamark Editor"
-#~ msgstr "Editor delle caratteristiche nautiche"
-
 #~ msgid "Edit OpenSeaMap"
 #~ msgstr "Modifica OpenSeaMap"
@@ -39379,7 +39360,7 @@
 #~ "riportare l''errore per \"{0}\"."
 
-#~ msgid "Get Layers"
-#~ msgstr "Ottieni i livelli"
-
 #~ msgid "Add relation"
 #~ msgstr "Aggiungi relazione"
+
+#~ msgid "Plugin for Seamap Editor"
+#~ msgstr "Estensione per la modifica di mappe nautiche"
Index: /applications/editors/josm/i18n/po/ja.po
===================================================================
--- /applications/editors/josm/i18n/po/ja.po	(revision 23466)
+++ /applications/editors/josm/i18n/po/ja.po	(revision 23467)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-01 19:14+0200\n"
-"PO-Revision-Date: 2010-09-30 16:50+0000\n"
+"POT-Creation-Date: 2010-10-03 22:45+0200\n"
+"PO-Revision-Date: 2010-10-03 15:57+0000\n"
 "Last-Translator: nori_u <Unknown>\n"
 "Language-Team: Japanese <tr@openstreetmap.jp>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2010-10-01 16:29+0000\n"
+"X-Launchpad-Export-Date: 2010-10-03 20:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: JAPAN\n"
@@ -88,5 +88,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:251
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:515
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:186
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121
@@ -232,5 +232,4 @@
 
 #. Strings in JFileChooser
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
@@ -281,7 +280,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:995
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:992
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119
@@ -306,5 +305,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
-#: build/specialmessages.java:33 build/specialmessages.java:90
+#: build/specialmessages.java:33
 msgid "Cancel"
 msgstr "キャンセル"
@@ -428,5 +427,5 @@
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:42
-#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:40
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -680,5 +679,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:145
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:509
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
@@ -1576,6 +1575,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:112
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:834
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:844
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:831
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:841
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:64
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:78
@@ -1639,5 +1638,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
-#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1327
+#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1340
 #: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1406
 #: build/specialmessages.java:65
@@ -1751,5 +1750,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
-#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1300
+#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1313
 #: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1382
 msgid "Close"
@@ -1802,5 +1801,4 @@
 msgstr "簡略化には、少なくとも1つのウェイを選択してください。"
 
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
@@ -1808,5 +1806,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:87
-#: build/specialmessages.java:88
 msgid "Yes"
 msgstr "はい"
@@ -2528,5 +2525,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:783
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:108
@@ -2962,5 +2959,5 @@
 "ださい: key=value"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:459
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:449
 #, java-format
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
@@ -2969,36 +2966,36 @@
 "\"relation\"です。"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:641
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:631
 #, java-format
 msgid "Unexpected token. Expected {0}, found {1}"
 msgstr "予期しないトークンです。{0}を期待してましたが、{1}を受け取りました。"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:656
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:646
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr "予想外のトークン: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:667
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:657
 msgid "Missing parameter for OR"
 msgstr "ORのパラメータが見つかりません"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:692
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:682
 msgid "Missing operator for NOT"
 msgstr "NOTに対する演算子が見つかりません"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:699
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:689
 msgid "Primitive id expected"
 msgstr "プリミティブIDを期待"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:701
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:704
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:691
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:694
 msgid "Range of numbers expected"
 msgstr "予期される数字の範囲"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:707
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:697
 msgid "Changeset id expected"
 msgstr "変更セットIDを期待"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:709
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:699
 msgid "Version expected"
 msgstr "バージョンを期待"
@@ -3062,5 +3059,4 @@
 
 #. Strings in JFileChooser
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
@@ -3091,5 +3087,5 @@
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:686
-#: build/specialmessages.java:58 build/specialmessages.java:87
+#: build/specialmessages.java:58
 msgid "OK"
 msgstr "OK"
@@ -3703,5 +3699,5 @@
 msgstr "東"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:243
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:258
 #, java-format
 msgid ""
@@ -3709,5 +3705,5 @@
 msgstr "プリミティブ {0} をデータセットに追加できません、既に含まれています"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:651
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:666
 #, java-format
 msgid ""
@@ -4563,5 +4559,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
 msgid "Presets"
@@ -6545,5 +6541,5 @@
 #. item "Highways/Streets/Roundabout" text "Name"
 #. <space />
-#. <key key="bridge" value="yes" />
+#. unparsed line             <combo key="bridge" values="yes,viaduct,swing,aqueduct" required="true" default="yes" text="Bridge" />
 #. <optional>
 #. item "Highways/Streets/Bridge" text "Name"
@@ -7862,5 +7858,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:572
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:639
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:146
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:143
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
 msgid "<different>"
@@ -9357,9 +9353,7 @@
 msgstr "ファイル名を選択"
 
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
-#: build/specialmessages.java:89
 msgid "No"
 msgstr "いいえ"
@@ -12350,5 +12344,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:489
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:512
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:514
 msgid "Please select an entry."
 msgstr "エントリーを選択してください。"
@@ -12778,38 +12772,38 @@
 msgstr "タグ付けプリセット"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:266
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:270
 msgid "Actions"
 msgstr "アクション"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:396
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:418
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:400
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:422
 msgid "Separator"
 msgstr "区切り"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:580
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:584
 msgid "Toolbar"
 msgstr "ツールバー"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:584
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:588
 msgid "Available"
 msgstr "有効"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:623
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:627
 msgid "Action parameters"
 msgstr "アクションパラメータ"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:624
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:628
 msgid "Parameter name"
 msgstr "パラメータ名"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:625
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:629
 msgid "Parameter value"
 msgstr "パラメータ値"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:630
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:634
 msgid "Toolbar customization"
 msgstr "ツールバーのカスタマイズ"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:631
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:635
 msgid "Customize the elements on the toolbar."
 msgstr "ツールバーの要素をカスタマイズ"
@@ -13140,5 +13134,5 @@
 msgstr "新しいタグを追加"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:384
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:381
 #, java-format
 msgid ""
@@ -13149,49 +13143,49 @@
 "にあるものと同じでなければなりません"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:514
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:511
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:314
 msgid "More information about this feature"
 msgstr "この地物の詳細情報"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:551
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:548
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr "不明な必要条件: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:608
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:605
 msgid "Available roles"
 msgstr "利用可能なロール"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:609
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:606
 msgid "role"
 msgstr "ロール"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:610
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607
 msgid "count"
 msgstr "件数"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:611
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:608
 msgid "elements"
 msgstr "エレメント"
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:626
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:623
 msgid "Optional Attributes:"
 msgstr "オプションの属性："
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:724
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:721
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "不明なタイプ: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:792
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:789
 msgid "Preset role element without parent"
 msgstr "親の無いロール要素をプリセット"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:800
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:797
 msgid "Preset sub element without parent"
 msgstr "親の無いサブ要素をプリセット"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:833
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:830
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -13201,15 +13195,15 @@
 msgstr "タグ付けプリセットのソース {0} を読み込めません。"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:843
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:840
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "走査時にエラー: {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:884
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:881
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "タイプ{0}の要素がサポートされます"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:980
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:977
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -13218,22 +13212,22 @@
 msgstr[0] "{0}このオブジェクトを変更"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:983
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:980
 msgid "Nothing selected!"
 msgstr "何も選択されていません！"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:985
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:982
 msgid "Selection unsuitable!"
 msgstr "選択が適切ではありません！"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:995
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:992
 msgid "Apply Preset"
 msgstr "プリセットの適用"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
 msgid "New relation"
 msgstr "新しいリレーション"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1083
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1080
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -13262,9 +13256,9 @@
 msgstr "プリセットを検索"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:273
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:278
 msgid "Show only applicable to selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:295
 msgid "Search in tags"
 msgstr ""
@@ -18385,7 +18379,6 @@
 
 #: ../plugins/rgisopen/src/rgisopen/RGISLayerFromFileAction.java:34
-#, fuzzy
 msgid "New picture layer from RGIS..."
-msgstr "ファイルからの新しい画像..."
+msgstr ""
 
 #: ../plugins/rgisopen/src/rgisopen/RGISOpenPlugin.java:33
@@ -18627,4 +18620,15 @@
 msgstr "Fade background: "
 
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:40
+#, fuzzy
+msgid "Seamap Editor"
+msgstr "Seamarkエディタ"
+
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#, fuzzy
+msgid "Seanap Editor"
+msgstr "Seamarkエディタ"
+
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:38
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
@@ -20634,5 +20638,5 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:90
 #, java-format
 msgid "{0} {1}% of GPS track"
@@ -20932,6 +20936,7 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88
-msgid "Get Capabilities"
-msgstr ""
+#, fuzzy
+msgid "Get Layers"
+msgstr "レイヤー"
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124
@@ -20943,10 +20948,7 @@
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:126
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:161
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:236
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:254
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:273
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:277
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:310
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:222
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:244
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:262
 msgid "WMS Error"
 msgstr ""
@@ -20966,17 +20968,14 @@
 msgstr "WMS URL"
 
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:235
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:221
+msgid "Could not parse WMS layer list."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:243
 msgid "Invalid service URL."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:253
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:261
 msgid "Could not retrieve WMS layer list."
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:272
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:276
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:280
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:309
-msgid "Could not parse WMS layer list."
 msgstr ""
 
@@ -22497,7 +22496,6 @@
 #: build/trans_presets.java:588 build/trans_presets.java:611
 #: build/trans_presets.java:630 build/trans_presets.java:651
-#, fuzzy
 msgid "Lit"
-msgstr "リスト"
+msgstr ""
 
 #. </optional>
@@ -23399,7 +23397,6 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. axleload (tonnes)"
 #: build/trans_presets.java:416
-#, fuzzy
 msgid "Max. axleload (tonnes)"
-msgstr "最大重量（トン）"
+msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
@@ -26255,7 +26252,6 @@
 
 #: build/trans_presets.java:1506
-#, fuzzy
 msgid "used"
-msgstr "未使用"
+msgstr ""
 
 #: build/trans_presets.java:1508 build/trans_presets.java:1509
@@ -26264,7 +26260,6 @@
 
 #: build/trans_presets.java:1508 build/trans_presets.java:1509
-#, fuzzy
 msgid "oldtimer"
-msgstr "フォルダ"
+msgstr ""
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Parts"
@@ -26876,12 +26871,10 @@
 #. item "Travel/Accomodation/Caravan Site" combo "Requires a fee"
 #: build/trans_presets.java:1828
-#, fuzzy
 msgid "Requires a fee"
-msgstr "リクエスト失敗"
+msgstr ""
 
 #: build/trans_presets.java:1828
-#, fuzzy
 msgid "interval"
-msgstr "工業地"
+msgstr ""
 
 #. item "Travel/Accomodation/Caravan Site" check "Power supply"
@@ -26892,7 +26885,6 @@
 #. item "Travel/Accomodation/Caravan Site" check "Tents allowed"
 #: build/trans_presets.java:1830
-#, fuzzy
 msgid "Tents allowed"
-msgstr "テストが失敗しました"
+msgstr ""
 
 #. item "Travel/Accomodation/Camping Site"
@@ -29464,13 +29456,11 @@
 #. item "Man Made/Mineshaft" label "Edit Mineshaft"
 #: build/trans_presets.java:2722
-#, fuzzy
 msgid "Edit Mineshaft"
-msgstr "マリーナの編集"
+msgstr ""
 
 #. item "Man Made/Mineshaft" text "Depth in meters"
 #: build/trans_presets.java:2725
-#, fuzzy
 msgid "Depth in meters"
-msgstr "アクションパラメータ"
+msgstr ""
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
@@ -29736,7 +29726,6 @@
 #. item "Amenities/Clock"
 #: build/trans_presets.java:2825
-#, fuzzy
 msgid "Clock"
-msgstr "ブロック"
+msgstr ""
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=clock"
@@ -29744,7 +29733,6 @@
 #. item "Amenities/Clock" label "Edit Clock"
 #: build/trans_presets.java:2828
-#, fuzzy
 msgid "Edit Clock"
-msgstr "ドックの編集"
+msgstr ""
 
 #. <key key="amenity" value="clock" />
@@ -29752,33 +29740,27 @@
 #. item "Amenities/Clock" combo "Display"
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "Display"
-msgstr "途中に島あり"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "analog"
-msgstr "運河"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "digital"
-msgstr "線路の編集"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "sundial"
-msgstr "スンニ派"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "unorthodox"
-msgstr "ギリシャ正教系"
+msgstr ""
 
 #. item "Amenities/Clock" combo "Support"
 #: build/trans_presets.java:2832
-#, fuzzy
 msgid "Support"
-msgstr "スポーツ"
+msgstr ""
 
 #: build/trans_presets.java:2832
@@ -29787,18 +29769,15 @@
 
 #: build/trans_presets.java:2832
-#, fuzzy
 msgid "billboard"
-msgstr "車止め杭"
+msgstr ""
 
 #. item "Amenities/Clock" combo "Visibility/readability"
 #: build/trans_presets.java:2833
-#, fuzzy
 msgid "Visibility/readability"
-msgstr "表示"
+msgstr ""
 
 #: build/trans_presets.java:2833
-#, fuzzy
 msgid "(up to 5m)"
-msgstr "max (最大値)"
+msgstr ""
 
 #: build/trans_presets.java:2833
@@ -29812,7 +29791,6 @@
 #. item "Amenities/Clock" check "Shows current date"
 #: build/trans_presets.java:2834
-#, fuzzy
 msgid "Shows current date"
-msgstr "最新データを保存します。"
+msgstr ""
 
 #. item "Amenities/Clock" check "Shows temperature"
@@ -29828,7 +29806,6 @@
 #. item "Amenities/Clock" check "Shows humidity"
 #: build/trans_presets.java:2837
-#, fuzzy
 msgid "Shows humidity"
-msgstr "履歴を表示"
+msgstr ""
 
 #. </optional>
@@ -35893,4 +35870,11 @@
 msgid "PCN 2006 - Italy"
 msgstr "PCN 2006 - イタリア"
+
+#.
+#. only for France
+#. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html
+#: build/trans_wms.java:52
+msgid "SPOTMaps (France)"
+msgstr ""
 
 #~ msgid "Move"
@@ -37822,7 +37806,4 @@
 #~ "ノードを共有していない２つのセグメントを選択してください。"
 
-#~ msgid "Seamark Editor"
-#~ msgstr "Seamarkエディタ"
-
 #~ msgid "jump"
 #~ msgstr "ジャンプ"
Index: /applications/editors/josm/i18n/po/nb.po
===================================================================
--- /applications/editors/josm/i18n/po/nb.po	(revision 23466)
+++ /applications/editors/josm/i18n/po/nb.po	(revision 23467)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-01 19:14+0200\n"
-"PO-Revision-Date: 2010-09-05 23:37+0000\n"
+"POT-Creation-Date: 2010-10-03 22:45+0200\n"
+"PO-Revision-Date: 2010-10-01 20:18+0000\n"
 "Last-Translator: Anders Einar Hilden <post@anderseinar.net>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-10-01 16:25+0000\n"
+"X-Launchpad-Export-Date: 2010-10-03 20:35+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -85,5 +85,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:251
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:515
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:186
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121
@@ -224,5 +224,4 @@
 
 #. Strings in JFileChooser
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
@@ -273,7 +272,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:995
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:992
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119
@@ -298,5 +297,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
-#: build/specialmessages.java:33 build/specialmessages.java:90
+#: build/specialmessages.java:33
 msgid "Cancel"
 msgstr "Avbryt"
@@ -418,5 +417,5 @@
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:42
-#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:40
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -671,5 +670,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:145
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:509
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
@@ -1545,6 +1544,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:112
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:834
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:844
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:831
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:841
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:64
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:78
@@ -1608,5 +1607,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
-#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1327
+#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1340
 #: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1406
 #: build/specialmessages.java:65
@@ -1719,5 +1718,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
-#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1300
+#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1313
 #: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1382
 msgid "Close"
@@ -1770,5 +1769,4 @@
 msgstr "Velg minst én linje å forenkle."
 
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
@@ -1776,5 +1774,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:87
-#: build/specialmessages.java:88
 msgid "Yes"
 msgstr "Ja"
@@ -2488,5 +2485,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:783
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:108
@@ -2905,41 +2902,41 @@
 "Nøkkel kan ikke være tom når egenskap-operatoren brukes. Bruk: nøkkel=verdi"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:459
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:449
 #, java-format
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
 msgstr "Ukjent objekttype: {0}. Tillatte verdier er node, way og relation"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:641
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:631
 #, java-format
 msgid "Unexpected token. Expected {0}, found {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:656
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:646
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr "Uventet symbol: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:667
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:657
 msgid "Missing parameter for OR"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:692
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:682
 msgid "Missing operator for NOT"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:689
+msgid "Primitive id expected"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:691
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:694
+msgid "Range of numbers expected"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:697
+msgid "Changeset id expected"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:699
-msgid "Primitive id expected"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:701
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:704
-msgid "Range of numbers expected"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:707
-msgid "Changeset id expected"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:709
 msgid "Version expected"
 msgstr ""
@@ -2996,5 +2993,4 @@
 
 #. Strings in JFileChooser
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
@@ -3025,5 +3021,5 @@
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:686
-#: build/specialmessages.java:58 build/specialmessages.java:87
+#: build/specialmessages.java:58
 msgid "OK"
 msgstr "OK"
@@ -3625,5 +3621,5 @@
 msgstr "Ø"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:243
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:258
 #, java-format
 msgid ""
@@ -3631,5 +3627,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:651
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:666
 #, java-format
 msgid ""
@@ -4471,5 +4467,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
 msgid "Presets"
@@ -6438,5 +6434,5 @@
 #. item "Highways/Streets/Roundabout" text "Name"
 #. <space />
-#. <key key="bridge" value="yes" />
+#. unparsed line             <combo key="bridge" values="yes,viaduct,swing,aqueduct" required="true" default="yes" text="Bridge" />
 #. <optional>
 #. item "Highways/Streets/Bridge" text "Name"
@@ -7731,5 +7727,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:572
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:639
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:146
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:143
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
 msgid "<different>"
@@ -9160,9 +9156,7 @@
 msgstr ""
 
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
-#: build/specialmessages.java:89
 msgid "No"
 msgstr ""
@@ -12049,5 +12043,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:489
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:512
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:514
 msgid "Please select an entry."
 msgstr "Velg en verdi."
@@ -12466,38 +12460,38 @@
 msgstr "Objektmal"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:266
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:270
 msgid "Actions"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:396
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:418
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:400
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:422
 msgid "Separator"
 msgstr "Skilletegn"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:580
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:584
 msgid "Toolbar"
 msgstr "Verktøylinje"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:584
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:588
 msgid "Available"
 msgstr "Tilgjengelig"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:623
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:627
 msgid "Action parameters"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:624
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:628
 msgid "Parameter name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:625
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:629
 msgid "Parameter value"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:630
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:634
 msgid "Toolbar customization"
 msgstr "Tilpass verktøylinje"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:631
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:635
 msgid "Customize the elements on the toolbar."
 msgstr "Tilpass element i verktøylinja"
@@ -12803,5 +12797,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:384
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:381
 #, java-format
 msgid ""
@@ -12810,49 +12804,49 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:514
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:511
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:314
 msgid "More information about this feature"
 msgstr "Mer informasjon om denne funksjonen"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:551
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:548
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:605
+msgid "Available roles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:606
+msgid "role"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607
+msgid "count"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:608
-msgid "Available roles"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:609
-msgid "role"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:610
-msgid "count"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:611
 msgid "elements"
 msgstr ""
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:626
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:623
 msgid "Optional Attributes:"
 msgstr "Valgfrie attributter:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:724
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:721
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Ukjent type: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:792
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:789
 msgid "Preset role element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:800
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:797
 msgid "Preset sub element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:833
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:830
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -12862,15 +12856,15 @@
 msgstr "Klarte ikke å lese egenskapslista for Objektmaler: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:843
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:840
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Feil ved lesing av {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:884
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:881
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Element type {0} kan brukes."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:980
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:977
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -12880,22 +12874,22 @@
 msgstr[1] "Endre {0} objekt"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:983
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:980
 msgid "Nothing selected!"
 msgstr "Intet er valgt!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:985
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:982
 msgid "Selection unsuitable!"
 msgstr "Utvalget passer ikke formålet!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:995
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:992
 msgid "Apply Preset"
 msgstr "Bruk Objektmal"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
 msgid "New relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1083
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1080
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -12924,9 +12918,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:273
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:278
 msgid "Show only applicable to selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:295
 msgid "Search in tags"
 msgstr ""
@@ -18121,4 +18115,15 @@
 msgstr "Demp bakgrunn: "
 
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:40
+#, fuzzy
+msgid "Seamap Editor"
+msgstr "Skilletegn"
+
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#, fuzzy
+msgid "Seanap Editor"
+msgstr "Skilletegn"
+
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:38
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
@@ -20111,5 +20116,5 @@
 msgstr "{0}, …"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:90
 #, java-format
 msgid "{0} {1}% of GPS track"
@@ -20399,6 +20404,7 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88
-msgid "Get Capabilities"
-msgstr ""
+#, fuzzy
+msgid "Get Layers"
+msgstr "Lag"
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124
@@ -20410,10 +20416,7 @@
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:126
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:161
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:236
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:254
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:273
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:277
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:310
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:222
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:244
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:262
 msgid "WMS Error"
 msgstr ""
@@ -20433,17 +20436,14 @@
 msgstr "WMS URL"
 
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:235
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:221
+msgid "Could not parse WMS layer list."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:243
 msgid "Invalid service URL."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:253
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:261
 msgid "Could not retrieve WMS layer list."
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:272
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:276
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:280
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:309
-msgid "Could not parse WMS layer list."
 msgstr ""
 
@@ -22845,7 +22845,6 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. axleload (tonnes)"
 #: build/trans_presets.java:416
-#, fuzzy
 msgid "Max. axleload (tonnes)"
-msgstr "Maksvekt (tonn)"
+msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
@@ -25698,7 +25697,6 @@
 
 #: build/trans_presets.java:1506
-#, fuzzy
 msgid "used"
-msgstr "bruk"
+msgstr ""
 
 #: build/trans_presets.java:1508 build/trans_presets.java:1509
@@ -25707,7 +25705,6 @@
 
 #: build/trans_presets.java:1508 build/trans_presets.java:1509
-#, fuzzy
 msgid "oldtimer"
-msgstr "tiger"
+msgstr ""
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Parts"
@@ -26319,12 +26316,10 @@
 #. item "Travel/Accomodation/Caravan Site" combo "Requires a fee"
 #: build/trans_presets.java:1828
-#, fuzzy
 msgid "Requires a fee"
-msgstr "Forespørsel feilet"
+msgstr ""
 
 #: build/trans_presets.java:1828
-#, fuzzy
 msgid "interval"
-msgstr "industri"
+msgstr ""
 
 #. item "Travel/Accomodation/Caravan Site" check "Power supply"
@@ -26335,7 +26330,6 @@
 #. item "Travel/Accomodation/Caravan Site" check "Tents allowed"
 #: build/trans_presets.java:1830
-#, fuzzy
 msgid "Tents allowed"
-msgstr "Bare to noder tillatt"
+msgstr ""
 
 #. item "Travel/Accomodation/Camping Site"
@@ -28906,13 +28900,11 @@
 #. item "Man Made/Mineshaft" label "Edit Mineshaft"
 #: build/trans_presets.java:2722
-#, fuzzy
 msgid "Edit Mineshaft"
-msgstr "Rediger marina"
+msgstr ""
 
 #. item "Man Made/Mineshaft" text "Depth in meters"
 #: build/trans_presets.java:2725
-#, fuzzy
 msgid "Depth in meters"
-msgstr "Bredde ( meter)"
+msgstr ""
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
@@ -29178,7 +29170,6 @@
 #. item "Amenities/Clock"
 #: build/trans_presets.java:2825
-#, fuzzy
 msgid "Clock"
-msgstr "Steinblokk"
+msgstr ""
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=clock"
@@ -29186,7 +29177,6 @@
 #. item "Amenities/Clock" label "Edit Clock"
 #: build/trans_presets.java:2828
-#, fuzzy
 msgid "Edit Clock"
-msgstr "Rediger tørrdokk"
+msgstr ""
 
 #. <key key="amenity" value="clock" />
@@ -29194,33 +29184,27 @@
 #. item "Amenities/Clock" combo "Display"
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "Display"
-msgstr "trafikkøy"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "analog"
-msgstr "Kanal"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "digital"
-msgstr "Rediger jernbane"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "sundial"
-msgstr "sunni"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "unorthodox"
-msgstr "ortodoks"
+msgstr ""
 
 #. item "Amenities/Clock" combo "Support"
 #: build/trans_presets.java:2832
-#, fuzzy
 msgid "Support"
-msgstr "Sport"
+msgstr ""
 
 #: build/trans_presets.java:2832
@@ -29229,7 +29213,6 @@
 
 #: build/trans_presets.java:2832
-#, fuzzy
 msgid "billboard"
-msgstr "Sperresøyle"
+msgstr ""
 
 #. item "Amenities/Clock" combo "Visibility/readability"
@@ -29252,7 +29235,6 @@
 #. item "Amenities/Clock" check "Shows current date"
 #: build/trans_presets.java:2834
-#, fuzzy
 msgid "Shows current date"
-msgstr "Lagre gjeldende data."
+msgstr ""
 
 #. item "Amenities/Clock" check "Shows temperature"
@@ -35331,4 +35313,11 @@
 #: build/trans_wms.java:49
 msgid "PCN 2006 - Italy"
+msgstr ""
+
+#.
+#. only for France
+#. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html
+#: build/trans_wms.java:52
+msgid "SPOTMaps (France)"
 msgstr ""
 
Index: /applications/editors/josm/i18n/po/nl.po
===================================================================
--- /applications/editors/josm/i18n/po/nl.po	(revision 23466)
+++ /applications/editors/josm/i18n/po/nl.po	(revision 23467)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-01 19:14+0200\n"
-"PO-Revision-Date: 2010-09-06 00:55+0000\n"
+"POT-Creation-Date: 2010-10-03 22:45+0200\n"
+"PO-Revision-Date: 2010-10-01 20:24+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Dutch <nl@li.org>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-10-01 16:25+0000\n"
+"X-Launchpad-Export-Date: 2010-10-03 20:35+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -85,5 +85,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:251
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:515
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:186
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121
@@ -231,5 +231,4 @@
 
 #. Strings in JFileChooser
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
@@ -280,7 +279,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:995
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:992
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119
@@ -305,5 +304,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
-#: build/specialmessages.java:33 build/specialmessages.java:90
+#: build/specialmessages.java:33
 msgid "Cancel"
 msgstr "Annuleren"
@@ -426,5 +425,5 @@
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:42
-#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:40
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -682,5 +681,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:145
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:509
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
@@ -1589,6 +1588,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:112
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:834
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:844
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:831
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:841
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:64
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:78
@@ -1652,5 +1651,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
-#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1327
+#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1340
 #: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1406
 #: build/specialmessages.java:65
@@ -1765,5 +1764,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
-#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1300
+#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1313
 #: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1382
 msgid "Close"
@@ -1816,5 +1815,4 @@
 msgstr "Selecteer minimaal één weg om te vereenvoudigen."
 
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
@@ -1822,5 +1820,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:87
-#: build/specialmessages.java:88
 msgid "Yes"
 msgstr "Ja"
@@ -2569,5 +2566,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:783
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:108
@@ -2998,5 +2995,5 @@
 "van gebruik: sleutel=waarde."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:459
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:449
 #, java-format
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
@@ -3004,36 +3001,36 @@
 "Onbekende primitief: {0}. Toegestane waarden zijn knoop, weg of relatie"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:641
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:631
 #, java-format
 msgid "Unexpected token. Expected {0}, found {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:656
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:646
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr "Onverwacht token: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:667
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:657
 msgid "Missing parameter for OR"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:692
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:682
 msgid "Missing operator for NOT"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:689
+msgid "Primitive id expected"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:691
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:694
+msgid "Range of numbers expected"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:697
+msgid "Changeset id expected"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:699
-msgid "Primitive id expected"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:701
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:704
-msgid "Range of numbers expected"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:707
-msgid "Changeset id expected"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:709
 msgid "Version expected"
 msgstr ""
@@ -3097,5 +3094,4 @@
 
 #. Strings in JFileChooser
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
@@ -3126,5 +3122,5 @@
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:686
-#: build/specialmessages.java:58 build/specialmessages.java:87
+#: build/specialmessages.java:58
 msgid "OK"
 msgstr "OK"
@@ -3733,5 +3729,5 @@
 msgstr "O"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:243
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:258
 #, java-format
 msgid ""
@@ -3739,5 +3735,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:651
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:666
 #, java-format
 msgid ""
@@ -4583,5 +4579,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
 msgid "Presets"
@@ -6530,5 +6526,5 @@
 #. item "Highways/Streets/Roundabout" text "Name"
 #. <space />
-#. <key key="bridge" value="yes" />
+#. unparsed line             <combo key="bridge" values="yes,viaduct,swing,aqueduct" required="true" default="yes" text="Bridge" />
 #. <optional>
 #. item "Highways/Streets/Bridge" text "Name"
@@ -7823,5 +7819,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:572
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:639
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:146
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:143
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
 msgid "<different>"
@@ -9259,9 +9255,7 @@
 msgstr ""
 
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
-#: build/specialmessages.java:89
 msgid "No"
 msgstr ""
@@ -12162,5 +12156,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:489
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:512
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:514
 msgid "Please select an entry."
 msgstr "Selecteer een invoer."
@@ -12580,38 +12574,38 @@
 msgstr "Tagvoorkeuzen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:266
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:270
 msgid "Actions"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:396
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:418
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:400
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:422
 msgid "Separator"
 msgstr "Scheidingsteken"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:580
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:584
 msgid "Toolbar"
 msgstr "Werkbalk"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:584
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:588
 msgid "Available"
 msgstr "Beschikbaar"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:623
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:627
 msgid "Action parameters"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:624
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:628
 msgid "Parameter name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:625
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:629
 msgid "Parameter value"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:630
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:634
 msgid "Toolbar customization"
 msgstr "Werkbalk aanpassing"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:631
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:635
 msgid "Customize the elements on the toolbar."
 msgstr "De elementen op de werkbalk aanpassen."
@@ -12917,5 +12911,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:384
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:381
 #, java-format
 msgid ""
@@ -12924,49 +12918,49 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:514
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:511
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:314
 msgid "More information about this feature"
 msgstr "Meer informatie over deze functionaliteit"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:551
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:548
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:605
+msgid "Available roles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:606
+msgid "role"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607
+msgid "count"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:608
-msgid "Available roles"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:609
-msgid "role"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:610
-msgid "count"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:611
 msgid "elements"
 msgstr ""
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:626
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:623
 msgid "Optional Attributes:"
 msgstr "Optionele attributen:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:724
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:721
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Onbekend type: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:792
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:789
 msgid "Preset role element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:800
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:797
 msgid "Preset sub element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:833
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:830
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -12976,15 +12970,15 @@
 msgstr "Kan voorkeuzebron voor tagging niet lezen: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:843
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:840
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Fout bij ontleden van {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:884
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:881
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Elementen van type {0} worden ondersteund."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:980
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:977
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -12994,22 +12988,22 @@
 msgstr[1] "{0} objecten wijzigen"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:983
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:980
 msgid "Nothing selected!"
 msgstr "Niets geselecteerd!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:985
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:982
 msgid "Selection unsuitable!"
 msgstr "Selectie is ongeschikt!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:995
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:992
 msgid "Apply Preset"
 msgstr "Voorinstelling toepassen"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
 msgid "New relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1083
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1080
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -13038,9 +13032,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:273
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:278
 msgid "Show only applicable to selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:295
 msgid "Search in tags"
 msgstr ""
@@ -18218,4 +18212,15 @@
 msgstr "Achtergrond vervagen: "
 
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:40
+#, fuzzy
+msgid "Seamap Editor"
+msgstr "Scheidingsteken"
+
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#, fuzzy
+msgid "Seanap Editor"
+msgstr "Scheidingsteken"
+
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:38
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
@@ -20214,5 +20219,5 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:90
 #, java-format
 msgid "{0} {1}% of GPS track"
@@ -20502,6 +20507,7 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88
-msgid "Get Capabilities"
-msgstr ""
+#, fuzzy
+msgid "Get Layers"
+msgstr "Lagen"
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124
@@ -20513,10 +20519,7 @@
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:126
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:161
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:236
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:254
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:273
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:277
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:310
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:222
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:244
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:262
 msgid "WMS Error"
 msgstr ""
@@ -20536,17 +20539,14 @@
 msgstr "WMS-URL"
 
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:235
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:221
+msgid "Could not parse WMS layer list."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:243
 msgid "Invalid service URL."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:253
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:261
 msgid "Could not retrieve WMS layer list."
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:272
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:276
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:280
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:309
-msgid "Could not parse WMS layer list."
 msgstr ""
 
@@ -22922,7 +22922,6 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. axleload (tonnes)"
 #: build/trans_presets.java:416
-#, fuzzy
 msgid "Max. axleload (tonnes)"
-msgstr "Max. gewicht (tonnen)"
+msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
@@ -25775,7 +25774,6 @@
 
 #: build/trans_presets.java:1506
-#, fuzzy
 msgid "used"
-msgstr "gebruik"
+msgstr ""
 
 #: build/trans_presets.java:1508 build/trans_presets.java:1509
@@ -26399,7 +26397,6 @@
 
 #: build/trans_presets.java:1828
-#, fuzzy
 msgid "interval"
-msgstr "industrieel"
+msgstr ""
 
 #. item "Travel/Accomodation/Caravan Site" check "Power supply"
@@ -26410,7 +26407,6 @@
 #. item "Travel/Accomodation/Caravan Site" check "Tents allowed"
 #: build/trans_presets.java:1830
-#, fuzzy
 msgid "Tents allowed"
-msgstr "Slechts twee knopen toegestaan"
+msgstr ""
 
 #. item "Travel/Accomodation/Camping Site"
@@ -28981,13 +28977,11 @@
 #. item "Man Made/Mineshaft" label "Edit Mineshaft"
 #: build/trans_presets.java:2722
-#, fuzzy
 msgid "Edit Mineshaft"
-msgstr "Jachthaven bewerken"
+msgstr ""
 
 #. item "Man Made/Mineshaft" text "Depth in meters"
 #: build/trans_presets.java:2725
-#, fuzzy
 msgid "Depth in meters"
-msgstr "Breedte (meters)"
+msgstr ""
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
@@ -29253,7 +29247,6 @@
 #. item "Amenities/Clock"
 #: build/trans_presets.java:2825
-#, fuzzy
 msgid "Clock"
-msgstr "Blok"
+msgstr ""
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=clock"
@@ -29261,7 +29254,6 @@
 #. item "Amenities/Clock" label "Edit Clock"
 #: build/trans_presets.java:2828
-#, fuzzy
 msgid "Edit Clock"
-msgstr "Dok bewerken"
+msgstr ""
 
 #. <key key="amenity" value="clock" />
@@ -29269,33 +29261,27 @@
 #. item "Amenities/Clock" combo "Display"
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "Display"
-msgstr "eiland"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "analog"
-msgstr "Kanaal"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "digital"
-msgstr "Spoor bewerken"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "sundial"
-msgstr "Indiaas"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "unorthodox"
-msgstr "Orthodox"
+msgstr ""
 
 #. item "Amenities/Clock" combo "Support"
 #: build/trans_presets.java:2832
-#, fuzzy
 msgid "Support"
-msgstr "Sport"
+msgstr ""
 
 #: build/trans_presets.java:2832
@@ -29304,7 +29290,6 @@
 
 #: build/trans_presets.java:2832
-#, fuzzy
 msgid "billboard"
-msgstr "Verkeerspaal"
+msgstr ""
 
 #. item "Amenities/Clock" combo "Visibility/readability"
@@ -29327,7 +29312,6 @@
 #. item "Amenities/Clock" check "Shows current date"
 #: build/trans_presets.java:2834
-#, fuzzy
 msgid "Shows current date"
-msgstr "Huidige gegevens opslaan."
+msgstr ""
 
 #. item "Amenities/Clock" check "Shows temperature"
@@ -35406,4 +35390,11 @@
 #: build/trans_wms.java:49
 msgid "PCN 2006 - Italy"
+msgstr ""
+
+#.
+#. only for France
+#. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html
+#: build/trans_wms.java:52
+msgid "SPOTMaps (France)"
 msgstr ""
 
Index: /applications/editors/josm/i18n/po/pl.po
===================================================================
--- /applications/editors/josm/i18n/po/pl.po	(revision 23466)
+++ /applications/editors/josm/i18n/po/pl.po	(revision 23467)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-01 19:14+0200\n"
-"PO-Revision-Date: 2010-09-30 16:35+0000\n"
-"Last-Translator: Rafał <Unknown>\n"
+"POT-Creation-Date: 2010-10-03 22:45+0200\n"
+"PO-Revision-Date: 2010-10-03 19:10+0000\n"
+"Last-Translator: lesi <Unknown>\n"
 "Language-Team: Polish <josm-lang-pl@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
@@ -17,5 +17,5 @@
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2010-10-01 16:28+0000\n"
+"X-Launchpad-Export-Date: 2010-10-03 20:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: POLAND\n"
@@ -89,5 +89,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:251
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:515
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:186
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121
@@ -233,5 +233,4 @@
 
 #. Strings in JFileChooser
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
@@ -282,7 +281,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:995
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:992
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119
@@ -307,5 +306,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
-#: build/specialmessages.java:33 build/specialmessages.java:90
+#: build/specialmessages.java:33
 msgid "Cancel"
 msgstr "Anuluj"
@@ -427,5 +426,5 @@
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:42
-#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:40
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -682,5 +681,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:145
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:509
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
@@ -1581,6 +1580,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:112
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:834
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:844
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:831
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:841
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:64
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:78
@@ -1644,5 +1643,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
-#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1327
+#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1340
 #: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1406
 #: build/specialmessages.java:65
@@ -1756,5 +1755,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
-#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1300
+#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1313
 #: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1382
 msgid "Close"
@@ -1807,5 +1806,4 @@
 msgstr ""
 
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
@@ -1813,5 +1811,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:87
-#: build/specialmessages.java:88
 msgid "Yes"
 msgstr "Tak"
@@ -2549,5 +2546,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:783
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:108
@@ -2960,41 +2957,41 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:459
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:449
 #, java-format
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:641
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:631
 #, java-format
 msgid "Unexpected token. Expected {0}, found {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:656
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:646
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:667
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:657
 msgid "Missing parameter for OR"
 msgstr "Brak parametru dla OR"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:692
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:682
 msgid "Missing operator for NOT"
 msgstr "Brak parametru dla NOT"
 
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:689
+msgid "Primitive id expected"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:691
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:694
+msgid "Range of numbers expected"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:697
+msgid "Changeset id expected"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:699
-msgid "Primitive id expected"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:701
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:704
-msgid "Range of numbers expected"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:707
-msgid "Changeset id expected"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:709
 msgid "Version expected"
 msgstr ""
@@ -3054,5 +3051,4 @@
 
 #. Strings in JFileChooser
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
@@ -3083,5 +3079,5 @@
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:686
-#: build/specialmessages.java:58 build/specialmessages.java:87
+#: build/specialmessages.java:58
 msgid "OK"
 msgstr "OK"
@@ -3703,5 +3699,5 @@
 msgstr "E"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:243
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:258
 #, java-format
 msgid ""
@@ -3709,5 +3705,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:651
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:666
 #, java-format
 msgid ""
@@ -4554,5 +4550,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
 msgid "Presets"
@@ -6529,5 +6525,5 @@
 #. item "Highways/Streets/Roundabout" text "Name"
 #. <space />
-#. <key key="bridge" value="yes" />
+#. unparsed line             <combo key="bridge" values="yes,viaduct,swing,aqueduct" required="true" default="yes" text="Bridge" />
 #. <optional>
 #. item "Highways/Streets/Bridge" text "Name"
@@ -7825,5 +7821,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:572
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:639
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:146
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:143
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
 msgid "<different>"
@@ -9250,9 +9246,7 @@
 msgstr ""
 
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
-#: build/specialmessages.java:89
 msgid "No"
 msgstr "Nie"
@@ -12148,5 +12142,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:489
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:512
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:514
 msgid "Please select an entry."
 msgstr ""
@@ -12565,38 +12559,38 @@
 msgstr "Szablony"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:266
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:270
 msgid "Actions"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:396
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:418
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:400
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:422
 msgid "Separator"
 msgstr "Separator"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:580
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:584
 msgid "Toolbar"
 msgstr "Pasek narzędzi"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:584
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:588
 msgid "Available"
 msgstr "Dostępne"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:623
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:627
 msgid "Action parameters"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:624
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:628
 msgid "Parameter name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:625
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:629
 msgid "Parameter value"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:630
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:634
 msgid "Toolbar customization"
 msgstr "Personalizacja paska narzędzi"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:631
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:635
 msgid "Customize the elements on the toolbar."
 msgstr "Dostosowywanie paska narzędzi do własnych potrzeb."
@@ -12913,5 +12907,5 @@
 msgstr "Dodaje nowy tag"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:384
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:381
 #, java-format
 msgid ""
@@ -12920,49 +12914,49 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:514
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:511
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:314
 msgid "More information about this feature"
 msgstr "Więcej informacji na temat tej funkcji"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:551
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:548
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:608
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:605
 msgid "Available roles"
 msgstr "Dostępne role"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:609
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:606
 msgid "role"
 msgstr "rola"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:610
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607
 msgid "count"
 msgstr "liczba"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:611
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:608
 msgid "elements"
 msgstr "elementy"
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:626
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:623
 msgid "Optional Attributes:"
 msgstr "Dodatkowe atrybuty:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:724
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:721
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Nieznany typ: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:792
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:789
 msgid "Preset role element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:800
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:797
 msgid "Preset sub element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:833
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:830
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -12972,15 +12966,15 @@
 msgstr "Nie można odczytać źródła szablonów: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:843
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:840
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Błąd podczas przetwarzania {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:884
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:881
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Elementy typu {0} nie są wspierane."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:980
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:977
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -12991,22 +12985,22 @@
 msgstr[2] "Zmień {0} obiektów"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:983
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:980
 msgid "Nothing selected!"
 msgstr "Nic nie wybrano!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:985
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:982
 msgid "Selection unsuitable!"
 msgstr "Nieodpowiednie zaznaczenie."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:995
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:992
 msgid "Apply Preset"
 msgstr "Zastosuj szablon"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
 msgid "New relation"
 msgstr "Nowa relacja"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1083
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1080
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -13035,9 +13029,9 @@
 msgstr "Szukaj szablony"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:273
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:278
 msgid "Show only applicable to selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:295
 msgid "Search in tags"
 msgstr ""
@@ -17961,7 +17955,6 @@
 
 #: ../plugins/rgisopen/src/rgisopen/RGISLayerFromFileAction.java:34
-#, fuzzy
 msgid "New picture layer from RGIS..."
-msgstr "Nowa warstwa z pliku"
+msgstr ""
 
 #: ../plugins/rgisopen/src/rgisopen/RGISOpenPlugin.java:33
@@ -18202,4 +18195,15 @@
 msgid "Fade background: "
 msgstr ""
+
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:40
+#, fuzzy
+msgid "Seamap Editor"
+msgstr "Separator"
+
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#, fuzzy
+msgid "Seanap Editor"
+msgstr "Separator"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:38
@@ -20184,5 +20188,5 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:90
 #, java-format
 msgid "{0} {1}% of GPS track"
@@ -20460,5 +20464,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:77
 msgid "Unnamed WMS Layer"
-msgstr ""
+msgstr "Warstwa WMS bez nazwy"
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:81
@@ -20469,9 +20473,10 @@
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:83
 msgid "Service URL"
-msgstr ""
+msgstr "Adres URL usługi"
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88
-msgid "Get Capabilities"
-msgstr ""
+#, fuzzy
+msgid "Get Layers"
+msgstr "Warstwy"
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124
@@ -20483,12 +20488,9 @@
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:126
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:161
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:236
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:254
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:273
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:277
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:310
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:222
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:244
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:262
 msgid "WMS Error"
-msgstr ""
+msgstr "Błąd WMS"
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:151
@@ -20506,17 +20508,14 @@
 msgstr "Adres serwera WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:235
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:221
+msgid "Could not parse WMS layer list."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:243
 msgid "Invalid service URL."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:253
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:261
 msgid "Could not retrieve WMS layer list."
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:272
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:276
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:280
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:309
-msgid "Could not parse WMS layer list."
 msgstr ""
 
@@ -22892,7 +22891,6 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. axleload (tonnes)"
 #: build/trans_presets.java:416
-#, fuzzy
 msgid "Max. axleload (tonnes)"
-msgstr "Maks. ciężar (w tonach)"
+msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
@@ -25745,7 +25743,6 @@
 
 #: build/trans_presets.java:1506
-#, fuzzy
 msgid "used"
-msgstr "nieużywane"
+msgstr ""
 
 #: build/trans_presets.java:1508 build/trans_presets.java:1509
@@ -26369,7 +26366,6 @@
 
 #: build/trans_presets.java:1828
-#, fuzzy
 msgid "interval"
-msgstr "Teren przemysłowy"
+msgstr ""
 
 #. item "Travel/Accomodation/Caravan Site" check "Power supply"
@@ -26380,7 +26376,6 @@
 #. item "Travel/Accomodation/Caravan Site" check "Tents allowed"
 #: build/trans_presets.java:1830
-#, fuzzy
 msgid "Tents allowed"
-msgstr "Dozwolone są tylko dwa węzły"
+msgstr ""
 
 #. item "Travel/Accomodation/Camping Site"
@@ -28946,18 +28941,16 @@
 #: build/trans_presets.java:2720
 msgid "Mineshaft"
-msgstr ""
+msgstr "szyb"
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dmineshaft" />
 #. item "Man Made/Mineshaft" label "Edit Mineshaft"
 #: build/trans_presets.java:2722
-#, fuzzy
 msgid "Edit Mineshaft"
-msgstr "Edycja mariny"
+msgstr "Edycja szybu"
 
 #. item "Man Made/Mineshaft" text "Depth in meters"
 #: build/trans_presets.java:2725
-#, fuzzy
 msgid "Depth in meters"
-msgstr "Szerokość (w metrach)"
+msgstr "Głębokość w metrach"
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
@@ -29223,7 +29216,6 @@
 #. item "Amenities/Clock"
 #: build/trans_presets.java:2825
-#, fuzzy
 msgid "Clock"
-msgstr "betonowy blok"
+msgstr ""
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=clock"
@@ -29231,7 +29223,6 @@
 #. item "Amenities/Clock" label "Edit Clock"
 #: build/trans_presets.java:2828
-#, fuzzy
 msgid "Edit Clock"
-msgstr "Edycja doku"
+msgstr ""
 
 #. <key key="amenity" value="clock" />
@@ -29239,33 +29230,27 @@
 #. item "Amenities/Clock" combo "Display"
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "Display"
-msgstr "wysepka"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "analog"
-msgstr "kanał"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "digital"
-msgstr "Edycja toru"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "sundial"
-msgstr "sunnici"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "unorthodox"
-msgstr "kościół prawosławny"
+msgstr ""
 
 #. item "Amenities/Clock" combo "Support"
 #: build/trans_presets.java:2832
-#, fuzzy
 msgid "Support"
-msgstr "Sport"
+msgstr ""
 
 #: build/trans_presets.java:2832
@@ -29274,18 +29259,15 @@
 
 #: build/trans_presets.java:2832
-#, fuzzy
 msgid "billboard"
-msgstr "słupek drogowy"
+msgstr ""
 
 #. item "Amenities/Clock" combo "Visibility/readability"
 #: build/trans_presets.java:2833
-#, fuzzy
 msgid "Visibility/readability"
-msgstr "Widoczność"
+msgstr ""
 
 #: build/trans_presets.java:2833
-#, fuzzy
 msgid "(up to 5m)"
-msgstr "aż do kafelka"
+msgstr ""
 
 #: build/trans_presets.java:2833
@@ -29299,7 +29281,6 @@
 #. item "Amenities/Clock" check "Shows current date"
 #: build/trans_presets.java:2834
-#, fuzzy
 msgid "Shows current date"
-msgstr "Zapisuje bieżące dane."
+msgstr ""
 
 #. item "Amenities/Clock" check "Shows temperature"
@@ -35380,4 +35361,11 @@
 msgstr ""
 
+#.
+#. only for France
+#. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html
+#: build/trans_wms.java:52
+msgid "SPOTMaps (France)"
+msgstr ""
+
 #~ msgid "Move"
 #~ msgstr "Przenieś"
Index: /applications/editors/josm/i18n/po/pt_BR.po
===================================================================
--- /applications/editors/josm/i18n/po/pt_BR.po	(revision 23466)
+++ /applications/editors/josm/i18n/po/pt_BR.po	(revision 23467)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-01 19:14+0200\n"
-"PO-Revision-Date: 2010-09-06 01:35+0000\n"
+"POT-Creation-Date: 2010-10-03 22:45+0200\n"
+"PO-Revision-Date: 2010-10-01 20:08+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2010-10-01 16:26+0000\n"
+"X-Launchpad-Export-Date: 2010-10-03 20:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -85,5 +85,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:251
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:515
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:186
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121
@@ -232,5 +232,4 @@
 
 #. Strings in JFileChooser
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
@@ -281,7 +280,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:995
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:992
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119
@@ -306,5 +305,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
-#: build/specialmessages.java:33 build/specialmessages.java:90
+#: build/specialmessages.java:33
 msgid "Cancel"
 msgstr "Cancelar"
@@ -426,5 +425,5 @@
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:42
-#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:40
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -681,5 +680,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:145
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:509
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
@@ -1589,6 +1588,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:112
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:834
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:844
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:831
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:841
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:64
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:78
@@ -1652,5 +1651,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
-#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1327
+#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1340
 #: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1406
 #: build/specialmessages.java:65
@@ -1765,5 +1764,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
-#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1300
+#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1313
 #: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1382
 msgid "Close"
@@ -1816,5 +1815,4 @@
 msgstr "Por favor, selecione ao menos um caminho para simplificar."
 
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
@@ -1822,5 +1820,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:87
-#: build/specialmessages.java:88
 msgid "Yes"
 msgstr "Sim"
@@ -2567,5 +2564,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:783
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:108
@@ -3008,5 +3005,5 @@
 "chave=valor"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:459
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:449
 #, java-format
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
@@ -3015,36 +3012,36 @@
 "relation (nó, caminho ou relação)."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:641
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:631
 #, java-format
 msgid "Unexpected token. Expected {0}, found {1}"
 msgstr "Token não esperado. Esperava {0}, mas {1} foi encontrado"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:656
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:646
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr "Credencial de autenticação inesperada: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:667
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:657
 msgid "Missing parameter for OR"
 msgstr "Parâmetro faltando para OR"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:692
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:682
 msgid "Missing operator for NOT"
 msgstr "Operador faltando para NOT"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:699
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:689
 msgid "Primitive id expected"
 msgstr "Id de primitiva esperado"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:701
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:704
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:691
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:694
 msgid "Range of numbers expected"
 msgstr "Intevalo de números esperado"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:707
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:697
 msgid "Changeset id expected"
 msgstr "Id de changeset esperado"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:709
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:699
 msgid "Version expected"
 msgstr "Versão esperada"
@@ -3109,5 +3106,4 @@
 
 #. Strings in JFileChooser
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
@@ -3138,5 +3134,5 @@
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:686
-#: build/specialmessages.java:58 build/specialmessages.java:87
+#: build/specialmessages.java:58
 msgid "OK"
 msgstr "Aceitar"
@@ -3768,5 +3764,5 @@
 msgstr "L"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:243
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:258
 #, java-format
 msgid ""
@@ -3776,5 +3772,5 @@
 "incluída"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:651
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:666
 #, java-format
 msgid ""
@@ -4647,5 +4643,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
 msgid "Presets"
@@ -6692,5 +6688,5 @@
 #. item "Highways/Streets/Roundabout" text "Name"
 #. <space />
-#. <key key="bridge" value="yes" />
+#. unparsed line             <combo key="bridge" values="yes,viaduct,swing,aqueduct" required="true" default="yes" text="Bridge" />
 #. <optional>
 #. item "Highways/Streets/Bridge" text "Name"
@@ -8045,5 +8041,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:572
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:639
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:146
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:143
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
 msgid "<different>"
@@ -9571,9 +9567,7 @@
 msgstr "Selecionar nome de arquivo"
 
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
-#: build/specialmessages.java:89
 msgid "No"
 msgstr "Não"
@@ -12636,5 +12630,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:489
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:512
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:514
 msgid "Please select an entry."
 msgstr "Por favor selecione um registro."
@@ -13063,38 +13057,38 @@
 msgstr "Padrões de predefinições"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:266
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:270
 msgid "Actions"
 msgstr "Ações"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:396
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:418
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:400
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:422
 msgid "Separator"
 msgstr "Separador"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:580
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:584
 msgid "Toolbar"
 msgstr "Barra de ferramentas"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:584
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:588
 msgid "Available"
 msgstr "Disponível"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:623
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:627
 msgid "Action parameters"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:624
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:628
 msgid "Parameter name"
 msgstr "Nome do parâmentro"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:625
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:629
 msgid "Parameter value"
 msgstr "Parâmetro valor"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:630
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:634
 msgid "Toolbar customization"
 msgstr "Personalização da barra de ferrametnas"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:631
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:635
 msgid "Customize the elements on the toolbar."
 msgstr "Personaliza os elementos na barra de ferramentas."
@@ -13426,5 +13420,5 @@
 msgstr "Adicionar nova tag"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:384
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:381
 #, java-format
 msgid ""
@@ -13433,49 +13427,49 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:514
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:511
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:314
 msgid "More information about this feature"
 msgstr "Mais informações sobre esta característica"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:551
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:548
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:605
+msgid "Available roles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:606
+msgid "role"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607
+msgid "count"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:608
-msgid "Available roles"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:609
-msgid "role"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:610
-msgid "count"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:611
 msgid "elements"
 msgstr "elementos"
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:626
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:623
 msgid "Optional Attributes:"
 msgstr "Atributos opcionais:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:724
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:721
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Tipo desconhecido: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:792
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:789
 msgid "Preset role element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:800
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:797
 msgid "Preset sub element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:833
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:830
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -13485,15 +13479,15 @@
 msgstr "Não foi possível ler a fonte de preferência de tags: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:843
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:840
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Erro analisando {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:884
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:881
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Elementos do tipo {0} são suportados."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:980
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:977
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -13503,22 +13497,22 @@
 msgstr[1] "Modificar objetos {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:983
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:980
 msgid "Nothing selected!"
 msgstr "Nada selecionado!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:985
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:982
 msgid "Selection unsuitable!"
 msgstr "Seleção inadequada!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:995
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:992
 msgid "Apply Preset"
 msgstr "Aplicar Preferência"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
 msgid "New relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1083
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1080
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -13547,9 +13541,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:273
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:278
 msgid "Show only applicable to selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:295
 msgid "Search in tags"
 msgstr ""
@@ -18502,7 +18496,6 @@
 
 #: ../plugins/rgisopen/src/rgisopen/RGISLayerFromFileAction.java:34
-#, fuzzy
 msgid "New picture layer from RGIS..."
-msgstr "Nova camada de imagem a partir do arquivo..."
+msgstr ""
 
 #: ../plugins/rgisopen/src/rgisopen/RGISOpenPlugin.java:33
@@ -18744,4 +18737,15 @@
 msgstr ""
 
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:40
+#, fuzzy
+msgid "Seamap Editor"
+msgstr "Separador"
+
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#, fuzzy
+msgid "Seanap Editor"
+msgstr "Separador"
+
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:38
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
@@ -20760,5 +20764,5 @@
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:90
 #, java-format
 msgid "{0} {1}% of GPS track"
@@ -21048,6 +21052,7 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88
-msgid "Get Capabilities"
-msgstr ""
+#, fuzzy
+msgid "Get Layers"
+msgstr "Camadas"
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124
@@ -21059,10 +21064,7 @@
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:126
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:161
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:236
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:254
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:273
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:277
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:310
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:222
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:244
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:262
 msgid "WMS Error"
 msgstr ""
@@ -21082,17 +21084,14 @@
 msgstr "URL do WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:235
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:221
+msgid "Could not parse WMS layer list."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:243
 msgid "Invalid service URL."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:253
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:261
 msgid "Could not retrieve WMS layer list."
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:272
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:276
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:280
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:309
-msgid "Could not parse WMS layer list."
 msgstr ""
 
@@ -23478,7 +23477,6 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. axleload (tonnes)"
 #: build/trans_presets.java:416
-#, fuzzy
 msgid "Max. axleload (tonnes)"
-msgstr "Peso máximo (toneladas)"
+msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
@@ -26331,7 +26329,6 @@
 
 #: build/trans_presets.java:1506
-#, fuzzy
 msgid "used"
-msgstr "não usado"
+msgstr ""
 
 #: build/trans_presets.java:1508 build/trans_presets.java:1509
@@ -26340,7 +26337,6 @@
 
 #: build/trans_presets.java:1508 build/trans_presets.java:1509
-#, fuzzy
 msgid "oldtimer"
-msgstr "pasta"
+msgstr ""
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Parts"
@@ -26952,12 +26948,10 @@
 #. item "Travel/Accomodation/Caravan Site" combo "Requires a fee"
 #: build/trans_presets.java:1828
-#, fuzzy
 msgid "Requires a fee"
-msgstr "A requisição falhou"
+msgstr ""
 
 #: build/trans_presets.java:1828
-#, fuzzy
 msgid "interval"
-msgstr "industrial"
+msgstr ""
 
 #. item "Travel/Accomodation/Caravan Site" check "Power supply"
@@ -26968,7 +26962,6 @@
 #. item "Travel/Accomodation/Caravan Site" check "Tents allowed"
 #: build/trans_presets.java:1830
-#, fuzzy
 msgid "Tents allowed"
-msgstr "O teste falhou"
+msgstr ""
 
 #. item "Travel/Accomodation/Camping Site"
@@ -29539,13 +29532,11 @@
 #. item "Man Made/Mineshaft" label "Edit Mineshaft"
 #: build/trans_presets.java:2722
-#, fuzzy
 msgid "Edit Mineshaft"
-msgstr "Editar Marina"
+msgstr ""
 
 #. item "Man Made/Mineshaft" text "Depth in meters"
 #: build/trans_presets.java:2725
-#, fuzzy
 msgid "Depth in meters"
-msgstr "Largura (metros)"
+msgstr ""
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
@@ -29811,7 +29802,6 @@
 #. item "Amenities/Clock"
 #: build/trans_presets.java:2825
-#, fuzzy
 msgid "Clock"
-msgstr "Bloquear"
+msgstr ""
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=clock"
@@ -29819,7 +29809,6 @@
 #. item "Amenities/Clock" label "Edit Clock"
 #: build/trans_presets.java:2828
-#, fuzzy
 msgid "Edit Clock"
-msgstr "Editar Hockey"
+msgstr ""
 
 #. <key key="amenity" value="clock" />
@@ -29827,33 +29816,27 @@
 #. item "Amenities/Clock" combo "Display"
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "Display"
-msgstr "ilha"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "analog"
-msgstr "Manual"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "digital"
-msgstr "Editar Hospital"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "sundial"
-msgstr "sunismo"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "unorthodox"
-msgstr "ortodoxa"
+msgstr ""
 
 #. item "Amenities/Clock" combo "Support"
 #: build/trans_presets.java:2832
-#, fuzzy
 msgid "Support"
-msgstr "Esportes"
+msgstr ""
 
 #: build/trans_presets.java:2832
@@ -29867,12 +29850,10 @@
 #. item "Amenities/Clock" combo "Visibility/readability"
 #: build/trans_presets.java:2833
-#, fuzzy
 msgid "Visibility/readability"
-msgstr "Visibilidade"
+msgstr ""
 
 #: build/trans_presets.java:2833
-#, fuzzy
 msgid "(up to 5m)"
-msgstr "até o tile"
+msgstr ""
 
 #: build/trans_presets.java:2833
@@ -29886,7 +29867,6 @@
 #. item "Amenities/Clock" check "Shows current date"
 #: build/trans_presets.java:2834
-#, fuzzy
 msgid "Shows current date"
-msgstr "Salvar dados atuais"
+msgstr ""
 
 #. item "Amenities/Clock" check "Shows temperature"
@@ -29902,7 +29882,6 @@
 #. item "Amenities/Clock" check "Shows humidity"
 #: build/trans_presets.java:2837
-#, fuzzy
 msgid "Shows humidity"
-msgstr "Exibir histórico"
+msgstr ""
 
 #. </optional>
@@ -35968,4 +35947,12 @@
 msgstr ""
 
+#.
+#. only for France
+#. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html
+#: build/trans_wms.java:52
+#, fuzzy
+msgid "SPOTMaps (France)"
+msgstr "UTM França (DOM)"
+
 #~ msgid "Uploading..."
 #~ msgstr "Enviando..."
Index: /applications/editors/josm/i18n/po/ro.po
===================================================================
--- /applications/editors/josm/i18n/po/ro.po	(revision 23466)
+++ /applications/editors/josm/i18n/po/ro.po	(revision 23467)
@@ -8,5 +8,5 @@
 "Project-Id-Version: JOSM\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-01 19:14+0200\n"
+"POT-Creation-Date: 2010-10-03 22:45+0200\n"
 "PO-Revision-Date: 2010-09-12 13:39+0000\n"
 "Last-Translator: bastik <Unknown>\n"
@@ -17,5 +17,5 @@
 "Plural-Forms: nplurals=3; plural=(n == 1 ? 0: (((n % 100 > 19) || ((n % 100 "
 "== 0) && (n != 0))) ? 2: 1));\n"
-"X-Launchpad-Export-Date: 2010-10-01 16:30+0000\n"
+"X-Launchpad-Export-Date: 2010-10-03 20:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: ROMANIA\n"
@@ -89,5 +89,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:251
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:515
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:186
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121
@@ -226,5 +226,4 @@
 
 #. Strings in JFileChooser
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
@@ -275,7 +274,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:995
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:992
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119
@@ -300,5 +299,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
-#: build/specialmessages.java:33 build/specialmessages.java:90
+#: build/specialmessages.java:33
 msgid "Cancel"
 msgstr "Anulează"
@@ -420,5 +419,5 @@
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:42
-#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:40
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -673,5 +672,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:145
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:509
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
@@ -1549,6 +1548,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:112
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:834
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:844
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:831
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:841
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:64
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:78
@@ -1612,5 +1611,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
-#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1327
+#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1340
 #: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1406
 #: build/specialmessages.java:65
@@ -1722,5 +1721,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
-#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1300
+#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1313
 #: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1382
 msgid "Close"
@@ -1773,5 +1772,4 @@
 msgstr ""
 
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
@@ -1779,5 +1777,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:87
-#: build/specialmessages.java:88
 msgid "Yes"
 msgstr ""
@@ -2479,5 +2476,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:783
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:108
@@ -2878,41 +2875,41 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:459
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:449
 #, java-format
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:641
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:631
 #, java-format
 msgid "Unexpected token. Expected {0}, found {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:656
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:646
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:667
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:657
 msgid "Missing parameter for OR"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:692
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:682
 msgid "Missing operator for NOT"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:689
+msgid "Primitive id expected"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:691
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:694
+msgid "Range of numbers expected"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:697
+msgid "Changeset id expected"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:699
-msgid "Primitive id expected"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:701
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:704
-msgid "Range of numbers expected"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:707
-msgid "Changeset id expected"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:709
 msgid "Version expected"
 msgstr ""
@@ -2969,5 +2966,4 @@
 
 #. Strings in JFileChooser
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
@@ -2998,5 +2994,5 @@
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:686
-#: build/specialmessages.java:58 build/specialmessages.java:87
+#: build/specialmessages.java:58
 msgid "OK"
 msgstr "OK"
@@ -3590,5 +3586,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:243
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:258
 #, java-format
 msgid ""
@@ -3596,5 +3592,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:651
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:666
 #, java-format
 msgid ""
@@ -4432,5 +4428,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
 msgid "Presets"
@@ -6374,5 +6370,5 @@
 #. item "Highways/Streets/Roundabout" text "Name"
 #. <space />
-#. <key key="bridge" value="yes" />
+#. unparsed line             <combo key="bridge" values="yes,viaduct,swing,aqueduct" required="true" default="yes" text="Bridge" />
 #. <optional>
 #. item "Highways/Streets/Bridge" text "Name"
@@ -7667,5 +7663,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:572
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:639
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:146
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:143
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
 msgid "<different>"
@@ -9079,9 +9075,7 @@
 msgstr ""
 
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
-#: build/specialmessages.java:89
 msgid "No"
 msgstr ""
@@ -11928,5 +11922,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:489
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:512
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:514
 msgid "Please select an entry."
 msgstr ""
@@ -12345,38 +12339,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:266
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:270
 msgid "Actions"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:396
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:418
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:400
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:422
 msgid "Separator"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:580
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:584
 msgid "Toolbar"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:584
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:588
 msgid "Available"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:623
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:627
 msgid "Action parameters"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:624
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:628
 msgid "Parameter name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:625
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:629
 msgid "Parameter value"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:630
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:634
 msgid "Toolbar customization"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:631
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:635
 msgid "Customize the elements on the toolbar."
 msgstr ""
@@ -12682,5 +12676,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:384
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:381
 #, java-format
 msgid ""
@@ -12689,49 +12683,49 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:514
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:511
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:314
 msgid "More information about this feature"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:551
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:548
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:605
+msgid "Available roles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:606
+msgid "role"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607
+msgid "count"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:608
-msgid "Available roles"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:609
-msgid "role"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:610
-msgid "count"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:611
 msgid "elements"
 msgstr ""
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:626
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:623
 msgid "Optional Attributes:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:724
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:721
 #, java-format
 msgid "Unknown type: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:792
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:789
 msgid "Preset role element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:800
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:797
 msgid "Preset sub element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:833
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:830
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -12741,15 +12735,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:843
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:840
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Eroare la prelucrarea {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:884
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:881
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:980
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:977
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -12760,22 +12754,22 @@
 msgstr[2] "Schimb {0} de obiecte"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:983
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:980
 msgid "Nothing selected!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:985
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:982
 msgid "Selection unsuitable!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:995
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:992
 msgid "Apply Preset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
 msgid "New relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1083
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1080
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -12804,9 +12798,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:273
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:278
 msgid "Show only applicable to selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:295
 msgid "Search in tags"
 msgstr ""
@@ -17921,4 +17915,13 @@
 msgstr ""
 
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:40
+msgid "Seamap Editor"
+msgstr ""
+
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+msgid "Seanap Editor"
+msgstr ""
+
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:38
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
@@ -19896,5 +19899,5 @@
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:90
 #, java-format
 msgid "{0} {1}% of GPS track"
@@ -20184,6 +20187,7 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88
-msgid "Get Capabilities"
-msgstr ""
+#, fuzzy
+msgid "Get Layers"
+msgstr "Straturi"
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124
@@ -20195,10 +20199,7 @@
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:126
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:161
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:236
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:254
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:273
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:277
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:310
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:222
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:244
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:262
 msgid "WMS Error"
 msgstr ""
@@ -20218,17 +20219,14 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:235
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:221
+msgid "Could not parse WMS layer list."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:243
 msgid "Invalid service URL."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:253
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:261
 msgid "Could not retrieve WMS layer list."
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:272
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:276
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:280
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:309
-msgid "Could not parse WMS layer list."
 msgstr ""
 
@@ -25448,7 +25446,6 @@
 
 #: build/trans_presets.java:1506
-#, fuzzy
 msgid "used"
-msgstr "utilizare"
+msgstr ""
 
 #: build/trans_presets.java:1508 build/trans_presets.java:1509
@@ -28922,7 +28919,6 @@
 #. item "Amenities/Clock"
 #: build/trans_presets.java:2825
-#, fuzzy
 msgid "Clock"
-msgstr "Culoare"
+msgstr ""
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=clock"
@@ -28937,7 +28933,6 @@
 #. item "Amenities/Clock" combo "Display"
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "Display"
-msgstr "Configurări afişare"
+msgstr ""
 
 #: build/trans_presets.java:2831
@@ -28989,7 +28984,6 @@
 #. item "Amenities/Clock" check "Shows current date"
 #: build/trans_presets.java:2834
-#, fuzzy
 msgid "Shows current date"
-msgstr "Salvează datele curente."
+msgstr ""
 
 #. item "Amenities/Clock" check "Shows temperature"
@@ -35070,4 +35064,11 @@
 msgstr ""
 
+#.
+#. only for France
+#. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html
+#: build/trans_wms.java:52
+msgid "SPOTMaps (France)"
+msgstr ""
+
 #~ msgid "Incorrect password or username."
 #~ msgstr "Parolă sau nume utilizator incorecte."
Index: /applications/editors/josm/i18n/po/ru.po
===================================================================
--- /applications/editors/josm/i18n/po/ru.po	(revision 23466)
+++ /applications/editors/josm/i18n/po/ru.po	(revision 23467)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-01 19:14+0200\n"
-"PO-Revision-Date: 2010-09-30 12:05+0000\n"
-"Last-Translator: METAdenisik <Unknown>\n"
+"POT-Creation-Date: 2010-10-03 22:45+0200\n"
+"PO-Revision-Date: 2010-10-01 20:33+0000\n"
+"Last-Translator: bastik <Unknown>\n"
 "Language-Team: Koptev Oleg <koptev.oleg@gmail.com>\n"
 "MIME-Version: 1.0\n"
@@ -17,5 +17,5 @@
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2010-10-01 16:29+0000\n"
+"X-Launchpad-Export-Date: 2010-10-03 20:35+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: RUSSIAN FEDERATION\n"
@@ -88,5 +88,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:251
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:515
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:186
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121
@@ -232,5 +232,4 @@
 
 #. Strings in JFileChooser
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
@@ -281,7 +280,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:995
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:992
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119
@@ -306,5 +305,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
-#: build/specialmessages.java:33 build/specialmessages.java:90
+#: build/specialmessages.java:33
 msgid "Cancel"
 msgstr "Отмена"
@@ -428,5 +427,5 @@
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:42
-#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:40
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -683,5 +682,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:145
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:509
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
@@ -1602,6 +1601,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:112
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:834
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:844
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:831
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:841
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:64
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:78
@@ -1665,5 +1664,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
-#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1327
+#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1340
 #: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1406
 #: build/specialmessages.java:65
@@ -1779,5 +1778,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
-#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1300
+#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1313
 #: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1382
 msgid "Close"
@@ -1830,5 +1829,4 @@
 msgstr "Выберите хотя бы одну линию для упрощения."
 
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
@@ -1836,5 +1834,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:87
-#: build/specialmessages.java:88
 msgid "Yes"
 msgstr "Да"
@@ -2597,5 +2594,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:783
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:108
@@ -3043,5 +3040,5 @@
 "использования: ключ=значение"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:459
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:449
 #, java-format
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
@@ -3050,36 +3047,36 @@
 "отношение"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:641
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:631
 #, java-format
 msgid "Unexpected token. Expected {0}, found {1}"
 msgstr "Неожиданный маркер. Ожидалось {0}, найдено {1}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:656
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:646
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr "Неожиданный знак: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:667
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:657
 msgid "Missing parameter for OR"
 msgstr "Пропущен параметр для OR"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:692
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:682
 msgid "Missing operator for NOT"
 msgstr "Пропущен оператор для NOT"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:699
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:689
 msgid "Primitive id expected"
 msgstr "Ожидался id элемента"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:701
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:704
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:691
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:694
 msgid "Range of numbers expected"
 msgstr "Ожидалась последовательность чисел"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:707
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:697
 msgid "Changeset id expected"
 msgstr "Ожидался ID пакета правок"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:709
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:699
 msgid "Version expected"
 msgstr "Ожидаемая версия"
@@ -3145,5 +3142,4 @@
 
 #. Strings in JFileChooser
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
@@ -3174,5 +3170,5 @@
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:686
-#: build/specialmessages.java:58 build/specialmessages.java:87
+#: build/specialmessages.java:58
 msgid "OK"
 msgstr "OK"
@@ -3809,5 +3805,5 @@
 msgstr "В"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:243
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:258
 #, java-format
 msgid ""
@@ -3816,5 +3812,5 @@
 "Невозможно добавить примитив {0} к набору данных, так как он уже присутствует"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:651
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:666
 #, java-format
 msgid ""
@@ -4693,5 +4689,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
 msgid "Presets"
@@ -6735,5 +6731,5 @@
 #. item "Highways/Streets/Roundabout" text "Name"
 #. <space />
-#. <key key="bridge" value="yes" />
+#. unparsed line             <combo key="bridge" values="yes,viaduct,swing,aqueduct" required="true" default="yes" text="Bridge" />
 #. <optional>
 #. item "Highways/Streets/Bridge" text "Name"
@@ -8077,5 +8073,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:572
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:639
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:146
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:143
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
 msgid "<different>"
@@ -9629,9 +9625,7 @@
 msgstr "Выберите имя файла"
 
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
-#: build/specialmessages.java:89
 msgid "No"
 msgstr "Нет"
@@ -12801,5 +12795,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:489
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:512
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:514
 msgid "Please select an entry."
 msgstr "Пожалуйста, выберите запись."
@@ -13261,38 +13255,38 @@
 msgstr "Заготовки с тегами"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:266
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:270
 msgid "Actions"
 msgstr "Действия"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:396
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:418
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:400
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:422
 msgid "Separator"
 msgstr "Разделитель"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:580
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:584
 msgid "Toolbar"
 msgstr "Панель инструментов"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:584
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:588
 msgid "Available"
 msgstr "Доступно"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:623
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:627
 msgid "Action parameters"
 msgstr "Параметры действия"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:624
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:628
 msgid "Parameter name"
 msgstr "Имя параметра"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:625
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:629
 msgid "Parameter value"
 msgstr "Значение параметра"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:630
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:634
 msgid "Toolbar customization"
 msgstr "Настройка панели инструментов"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:631
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:635
 msgid "Customize the elements on the toolbar."
 msgstr "Настроить элементы панели инструментов."
@@ -13651,5 +13645,5 @@
 msgstr "Добавить новый тег"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:384
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:381
 #, java-format
 msgid ""
@@ -13660,49 +13654,49 @@
 "display_values должно быть такое же, как и в values"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:514
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:511
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:314
 msgid "More information about this feature"
 msgstr "Подробнее"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:551
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:548
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr "Неизвестный запрос: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:608
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:605
 msgid "Available roles"
 msgstr "Доступные роли"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:609
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:606
 msgid "role"
 msgstr "роль"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:610
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607
 msgid "count"
 msgstr "количество"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:611
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:608
 msgid "elements"
 msgstr "элементы"
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:626
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:623
 msgid "Optional Attributes:"
 msgstr "Дополнительные атрибуты:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:724
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:721
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Неизвестный тип: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:792
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:789
 msgid "Preset role element without parent"
 msgstr "Заготовка элемента роли без родителей"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:800
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:797
 msgid "Preset sub element without parent"
 msgstr "Заготовка вложенного элемента без родителей"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:833
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:830
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -13712,15 +13706,15 @@
 msgstr "Не удалось прочитать источник заготовок тегов: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:843
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:840
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Ошибка при разборе {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:884
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:881
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Элемент типа {0} не поддерживается."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:980
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:977
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -13731,22 +13725,22 @@
 msgstr[2] "Изменить {0} объектов"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:983
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:980
 msgid "Nothing selected!"
 msgstr "Ничего не выделено!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:985
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:982
 msgid "Selection unsuitable!"
 msgstr "Неудачный выбор!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:995
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:992
 msgid "Apply Preset"
 msgstr "Применить заготовку"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
 msgid "New relation"
 msgstr "Новое отношение"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1083
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1080
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -13775,9 +13769,9 @@
 msgstr "Поиск заготовок"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:273
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:278
 msgid "Show only applicable to selection"
 msgstr "Показывать только подходящие к выделенным"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:295
 msgid "Search in tags"
 msgstr "Поиск в тегах"
@@ -19097,7 +19091,6 @@
 
 #: ../plugins/rgisopen/src/rgisopen/RGISLayerFromFileAction.java:34
-#, fuzzy
 msgid "New picture layer from RGIS..."
-msgstr "Новый слой изображения из файла..."
+msgstr ""
 
 #: ../plugins/rgisopen/src/rgisopen/RGISOpenPlugin.java:33
@@ -19338,4 +19331,15 @@
 msgid "Fade background: "
 msgstr "Бледный фон: "
+
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:40
+#, fuzzy
+msgid "Seamap Editor"
+msgstr "Редактор морских объектов Seamark Editor"
+
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#, fuzzy
+msgid "Seanap Editor"
+msgstr "Редактор морских объектов Seamark Editor"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:38
@@ -21447,5 +21451,5 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:90
 #, java-format
 msgid "{0} {1}% of GPS track"
@@ -21748,6 +21752,6 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88
-msgid "Get Capabilities"
-msgstr ""
+msgid "Get Layers"
+msgstr "Получить слои"
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124
@@ -21761,10 +21765,7 @@
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:126
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:161
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:236
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:254
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:273
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:277
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:310
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:222
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:244
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:262
 msgid "WMS Error"
 msgstr "Ошибка WMS"
@@ -21784,18 +21785,15 @@
 msgstr "Ссылка на WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:235
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:221
+msgid "Could not parse WMS layer list."
+msgstr "Невозможно разобрать список слоев WMS."
+
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:243
 msgid "Invalid service URL."
 msgstr "Неверная служебная ссылка"
 
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:253
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:261
 msgid "Could not retrieve WMS layer list."
 msgstr "Невозможно загрузить список слоев WMS."
-
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:272
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:276
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:280
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:309
-msgid "Could not parse WMS layer list."
-msgstr "Невозможно разобрать список слоев WMS."
 
 #: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:76
@@ -23355,7 +23353,6 @@
 #: build/trans_presets.java:588 build/trans_presets.java:611
 #: build/trans_presets.java:630 build/trans_presets.java:651
-#, fuzzy
 msgid "Lit"
-msgstr "Список"
+msgstr ""
 
 #. </optional>
@@ -24257,7 +24254,6 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. axleload (tonnes)"
 #: build/trans_presets.java:416
-#, fuzzy
 msgid "Max. axleload (tonnes)"
-msgstr "Макс. масса (в тоннах)"
+msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
@@ -27110,7 +27106,6 @@
 
 #: build/trans_presets.java:1506
-#, fuzzy
 msgid "used"
-msgstr "не задействовано"
+msgstr ""
 
 #: build/trans_presets.java:1508 build/trans_presets.java:1509
@@ -27119,7 +27114,6 @@
 
 #: build/trans_presets.java:1508 build/trans_presets.java:1509
-#, fuzzy
 msgid "oldtimer"
-msgstr "каталог"
+msgstr ""
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Parts"
@@ -27731,12 +27725,10 @@
 #. item "Travel/Accomodation/Caravan Site" combo "Requires a fee"
 #: build/trans_presets.java:1828
-#, fuzzy
 msgid "Requires a fee"
-msgstr "Запрос не удался"
+msgstr ""
 
 #: build/trans_presets.java:1828
-#, fuzzy
 msgid "interval"
-msgstr "промышленный"
+msgstr ""
 
 #. item "Travel/Accomodation/Caravan Site" check "Power supply"
@@ -27747,7 +27739,6 @@
 #. item "Travel/Accomodation/Caravan Site" check "Tents allowed"
 #: build/trans_presets.java:1830
-#, fuzzy
 msgid "Tents allowed"
-msgstr "Тест не прошёл"
+msgstr ""
 
 #. item "Travel/Accomodation/Camping Site"
@@ -30318,13 +30309,11 @@
 #. item "Man Made/Mineshaft" label "Edit Mineshaft"
 #: build/trans_presets.java:2722
-#, fuzzy
 msgid "Edit Mineshaft"
-msgstr "Свойства пристани для яхт"
+msgstr ""
 
 #. item "Man Made/Mineshaft" text "Depth in meters"
 #: build/trans_presets.java:2725
-#, fuzzy
 msgid "Depth in meters"
-msgstr "Параметры действия"
+msgstr ""
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
@@ -30590,7 +30579,6 @@
 #. item "Amenities/Clock"
 #: build/trans_presets.java:2825
-#, fuzzy
 msgid "Clock"
-msgstr "Бетонный блок"
+msgstr ""
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=clock"
@@ -30598,7 +30586,6 @@
 #. item "Amenities/Clock" label "Edit Clock"
 #: build/trans_presets.java:2828
-#, fuzzy
 msgid "Edit Clock"
-msgstr "Свойства дока"
+msgstr ""
 
 #. <key key="amenity" value="clock" />
@@ -30606,33 +30593,27 @@
 #. item "Amenities/Clock" combo "Display"
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "Display"
-msgstr "воспр"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "analog"
-msgstr "Канал"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "digital"
-msgstr "Свойства железной дороги"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "sundial"
-msgstr "сунниты"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "unorthodox"
-msgstr "православные"
+msgstr ""
 
 #. item "Amenities/Clock" combo "Support"
 #: build/trans_presets.java:2832
-#, fuzzy
 msgid "Support"
-msgstr "Спорт"
+msgstr ""
 
 #: build/trans_presets.java:2832
@@ -30641,18 +30622,15 @@
 
 #: build/trans_presets.java:2832
-#, fuzzy
 msgid "billboard"
-msgstr "Столбик"
+msgstr ""
 
 #. item "Amenities/Clock" combo "Visibility/readability"
 #: build/trans_presets.java:2833
-#, fuzzy
 msgid "Visibility/readability"
-msgstr "Видимость"
+msgstr ""
 
 #: build/trans_presets.java:2833
-#, fuzzy
 msgid "(up to 5m)"
-msgstr "до квадрата"
+msgstr ""
 
 #: build/trans_presets.java:2833
@@ -30666,7 +30644,6 @@
 #. item "Amenities/Clock" check "Shows current date"
 #: build/trans_presets.java:2834
-#, fuzzy
 msgid "Shows current date"
-msgstr "Сохранить текущие данные."
+msgstr ""
 
 #. item "Amenities/Clock" check "Shows temperature"
@@ -30682,7 +30659,6 @@
 #. item "Amenities/Clock" check "Shows humidity"
 #: build/trans_presets.java:2837
-#, fuzzy
 msgid "Shows humidity"
-msgstr "Показать историю"
+msgstr ""
 
 #. </optional>
@@ -36748,4 +36724,12 @@
 msgid "PCN 2006 - Italy"
 msgstr "PCN 2006 — Италия"
+
+#.
+#. only for France
+#. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html
+#: build/trans_wms.java:52
+#, fuzzy
+msgid "SPOTMaps (France)"
+msgstr "Франция UTM (DOM)"
 
 #~ msgid "No data imported."
@@ -39121,7 +39105,4 @@
 #~ msgstr "Создать отношение для связи номера домов с улицей"
 
-#~ msgid "Seamark Editor"
-#~ msgstr "Редактор морских объектов Seamark Editor"
-
 #~ msgid "Edit OpenSeaMap"
 #~ msgstr "Редактировать OpenSeaMap"
@@ -39130,7 +39111,4 @@
 #~ msgstr "Перейти"
 
-#~ msgid "Get Layers"
-#~ msgstr "Получить слои"
-
 #~ msgid "Add relation"
 #~ msgstr "Добавить отношение"
Index: /applications/editors/josm/i18n/po/sk.po
===================================================================
--- /applications/editors/josm/i18n/po/sk.po	(revision 23466)
+++ /applications/editors/josm/i18n/po/sk.po	(revision 23467)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-01 19:14+0200\n"
-"PO-Revision-Date: 2010-09-06 00:00+0000\n"
+"POT-Creation-Date: 2010-10-03 22:45+0200\n"
+"PO-Revision-Date: 2010-10-01 20:04+0000\n"
 "Last-Translator: Vlado <babicvm@szm.sk>\n"
 "Language-Team: Slovak <sk@li.org>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
-"X-Launchpad-Export-Date: 2010-10-01 16:25+0000\n"
+"X-Launchpad-Export-Date: 2010-10-03 20:34+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -85,5 +85,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:251
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:515
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:186
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121
@@ -229,5 +229,4 @@
 
 #. Strings in JFileChooser
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
@@ -278,7 +277,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:995
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:992
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119
@@ -303,5 +302,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
-#: build/specialmessages.java:33 build/specialmessages.java:90
+#: build/specialmessages.java:33
 msgid "Cancel"
 msgstr "Zrušiť"
@@ -423,5 +422,5 @@
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:42
-#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:40
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -676,5 +675,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:145
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:509
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
@@ -1584,6 +1583,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:112
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:834
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:844
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:831
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:841
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:64
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:78
@@ -1647,5 +1646,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
-#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1327
+#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1340
 #: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1406
 #: build/specialmessages.java:65
@@ -1761,5 +1760,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
-#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1300
+#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1313
 #: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1382
 msgid "Close"
@@ -1812,5 +1811,4 @@
 msgstr "Vyberte aspoň jednu cestu k zjednodušeniu."
 
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
@@ -1818,5 +1816,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:87
-#: build/specialmessages.java:88
 msgid "Yes"
 msgstr "Áno"
@@ -2577,5 +2574,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:783
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:108
@@ -3014,5 +3011,5 @@
 "použitia: kľúč=hodnota"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:459
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:449
 #, java-format
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
@@ -3020,36 +3017,36 @@
 "Neznámy pôvodný typ: {0}. Povolené hodnoty sú, body, cesty, alebo relácie"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:641
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:631
 #, java-format
 msgid "Unexpected token. Expected {0}, found {1}"
 msgstr "Neočakávaný symbol. Očakávaný {0}, vytvorený {1}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:656
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:646
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr "Neočakávaná značka: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:667
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:657
 msgid "Missing parameter for OR"
 msgstr "Chýbajúci parameter pre OR"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:692
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:682
 msgid "Missing operator for NOT"
 msgstr "Chýbajúci operator pre NOT"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:699
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:689
 msgid "Primitive id expected"
 msgstr "Očakávané ID pôvodných"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:701
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:704
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:691
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:694
 msgid "Range of numbers expected"
 msgstr "Očakávaný rozsah čísel"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:707
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:697
 msgid "Changeset id expected"
 msgstr "Očakávané ID zmenového súboru"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:709
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:699
 msgid "Version expected"
 msgstr "Očakávaná verzia"
@@ -3113,5 +3110,4 @@
 
 #. Strings in JFileChooser
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
@@ -3142,5 +3138,5 @@
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:686
-#: build/specialmessages.java:58 build/specialmessages.java:87
+#: build/specialmessages.java:58
 msgid "OK"
 msgstr "OK"
@@ -3777,5 +3773,5 @@
 msgstr "V"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:243
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:258
 #, java-format
 msgid ""
@@ -3783,5 +3779,5 @@
 msgstr "Neschopnosť pridať pôvodné {0} do dátovej sady, pretože sú už zahrnuté"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:651
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:666
 #, java-format
 msgid ""
@@ -4656,5 +4652,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
 msgid "Presets"
@@ -6699,5 +6695,5 @@
 #. item "Highways/Streets/Roundabout" text "Name"
 #. <space />
-#. <key key="bridge" value="yes" />
+#. unparsed line             <combo key="bridge" values="yes,viaduct,swing,aqueduct" required="true" default="yes" text="Bridge" />
 #. <optional>
 #. item "Highways/Streets/Bridge" text "Name"
@@ -8038,5 +8034,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:572
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:639
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:146
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:143
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
 msgid "<different>"
@@ -9559,9 +9555,7 @@
 msgstr "Vybrať meno súboru"
 
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
-#: build/specialmessages.java:89
 msgid "No"
 msgstr "Nie"
@@ -12694,5 +12688,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:489
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:512
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:514
 msgid "Please select an entry."
 msgstr "Vyber prosím nejakú položku."
@@ -13136,38 +13130,38 @@
 msgstr "Predvoľby značenia (Tagging Presets)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:266
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:270
 msgid "Actions"
 msgstr "Akcie"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:396
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:418
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:400
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:422
 msgid "Separator"
 msgstr "Oddeľovač"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:580
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:584
 msgid "Toolbar"
 msgstr "Panel nástrojov"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:584
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:588
 msgid "Available"
 msgstr "Dostupný"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:623
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:627
 msgid "Action parameters"
 msgstr "Parametre akcie"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:624
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:628
 msgid "Parameter name"
 msgstr "Názov parametra"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:625
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:629
 msgid "Parameter value"
 msgstr "Hodnota parametra"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:630
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:634
 msgid "Toolbar customization"
 msgstr "Úprava panela nástrojov"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:631
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:635
 msgid "Customize the elements on the toolbar."
 msgstr "Úprava položiek na panely nástrojov."
@@ -13519,5 +13513,5 @@
 msgstr "Pridať novú značku"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:384
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:381
 #, java-format
 msgid ""
@@ -13528,49 +13522,49 @@
 "byť rovnaký ako v hodnotách"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:514
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:511
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:314
 msgid "More information about this feature"
 msgstr "Viac informácii o tejto vlastnosti"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:551
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:548
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:608
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:605
 msgid "Available roles"
 msgstr "Dostupné úlohy"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:609
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:606
 msgid "role"
 msgstr "úlohy"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:610
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607
 msgid "count"
 msgstr "počet"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:611
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:608
 msgid "elements"
 msgstr "prvky"
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:626
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:623
 msgid "Optional Attributes:"
 msgstr "Voliteľné atribúty:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:724
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:721
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Neznány type (druh): {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:792
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:789
 msgid "Preset role element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:800
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:797
 msgid "Preset sub element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:833
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:830
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -13580,15 +13574,15 @@
 msgstr "Nemôžem načítať zdroj predvolieb značenia: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:843
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:840
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Chyba rozkladania(parsovania) {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:884
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:881
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Elementy typu(druhu) {0} sú podporované."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:980
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:977
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -13599,22 +13593,22 @@
 msgstr[2] "Zmeniť {0} objektov"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:983
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:980
 msgid "Nothing selected!"
 msgstr "Nič nie je vybraté!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:985
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:982
 msgid "Selection unsuitable!"
 msgstr "Nevhodný výber!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:995
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:992
 msgid "Apply Preset"
 msgstr "Použiť predvolené"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
 msgid "New relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1083
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1080
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -13643,9 +13637,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:273
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:278
 msgid "Show only applicable to selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:295
 msgid "Search in tags"
 msgstr ""
@@ -18851,7 +18845,6 @@
 
 #: ../plugins/rgisopen/src/rgisopen/RGISLayerFromFileAction.java:34
-#, fuzzy
 msgid "New picture layer from RGIS..."
-msgstr "Nová obrázková vrstva zo súboru ..."
+msgstr ""
 
 #: ../plugins/rgisopen/src/rgisopen/RGISOpenPlugin.java:33
@@ -19092,4 +19085,15 @@
 msgid "Fade background: "
 msgstr "Vyblednúť pozadie: "
+
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:40
+#, fuzzy
+msgid "Seamap Editor"
+msgstr "Oddeľovač"
+
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#, fuzzy
+msgid "Seanap Editor"
+msgstr "Oddeľovač"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:38
@@ -21182,5 +21186,5 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:90
 #, java-format
 msgid "{0} {1}% of GPS track"
@@ -21483,6 +21487,7 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88
-msgid "Get Capabilities"
-msgstr ""
+#, fuzzy
+msgid "Get Layers"
+msgstr "Vrstvy"
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124
@@ -21494,10 +21499,7 @@
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:126
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:161
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:236
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:254
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:273
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:277
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:310
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:222
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:244
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:262
 msgid "WMS Error"
 msgstr ""
@@ -21517,17 +21519,14 @@
 msgstr "WMS URL"
 
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:235
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:221
+msgid "Could not parse WMS layer list."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:243
 msgid "Invalid service URL."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:253
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:261
 msgid "Could not retrieve WMS layer list."
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:272
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:276
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:280
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:309
-msgid "Could not parse WMS layer list."
 msgstr ""
 
@@ -23960,7 +23959,6 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. axleload (tonnes)"
 #: build/trans_presets.java:416
-#, fuzzy
 msgid "Max. axleload (tonnes)"
-msgstr "Max. hmotnosť (ton)"
+msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
@@ -26821,7 +26819,6 @@
 
 #: build/trans_presets.java:1506
-#, fuzzy
 msgid "used"
-msgstr "nepoužité"
+msgstr ""
 
 #: build/trans_presets.java:1508 build/trans_presets.java:1509
@@ -26830,7 +26827,6 @@
 
 #: build/trans_presets.java:1508 build/trans_presets.java:1509
-#, fuzzy
 msgid "oldtimer"
-msgstr "priečinok"
+msgstr ""
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Parts"
@@ -27442,12 +27438,10 @@
 #. item "Travel/Accomodation/Caravan Site" combo "Requires a fee"
 #: build/trans_presets.java:1828
-#, fuzzy
 msgid "Requires a fee"
-msgstr "Požiadavka neúspešná"
+msgstr ""
 
 #: build/trans_presets.java:1828
-#, fuzzy
 msgid "interval"
-msgstr "závody"
+msgstr ""
 
 #. item "Travel/Accomodation/Caravan Site" check "Power supply"
@@ -27458,7 +27452,6 @@
 #. item "Travel/Accomodation/Caravan Site" check "Tents allowed"
 #: build/trans_presets.java:1830
-#, fuzzy
 msgid "Tents allowed"
-msgstr "Test neúspešný"
+msgstr ""
 
 #. item "Travel/Accomodation/Camping Site"
@@ -30033,13 +30026,11 @@
 #. item "Man Made/Mineshaft" label "Edit Mineshaft"
 #: build/trans_presets.java:2722
-#, fuzzy
 msgid "Edit Mineshaft"
-msgstr "Upraviť Prístav (Marina)"
+msgstr ""
 
 #. item "Man Made/Mineshaft" text "Depth in meters"
 #: build/trans_presets.java:2725
-#, fuzzy
 msgid "Depth in meters"
-msgstr "Parametre akcie"
+msgstr ""
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
@@ -30305,7 +30296,6 @@
 #. item "Amenities/Clock"
 #: build/trans_presets.java:2825
-#, fuzzy
 msgid "Clock"
-msgstr "Balvan (Block)"
+msgstr ""
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=clock"
@@ -30313,7 +30303,6 @@
 #. item "Amenities/Clock" label "Edit Clock"
 #: build/trans_presets.java:2828
-#, fuzzy
 msgid "Edit Clock"
-msgstr "Upraviť dok, prístavnú hrádzu"
+msgstr ""
 
 #. <key key="amenity" value="clock" />
@@ -30321,33 +30310,27 @@
 #. item "Amenities/Clock" combo "Display"
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "Display"
-msgstr "ostrovček"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "analog"
-msgstr "Prieplav"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "digital"
-msgstr "Upraviť železničnú koľaj"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "sundial"
-msgstr "sunnitská"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "unorthodox"
-msgstr "orthodoxná"
+msgstr ""
 
 #. item "Amenities/Clock" combo "Support"
 #: build/trans_presets.java:2832
-#, fuzzy
 msgid "Support"
-msgstr "Šport"
+msgstr ""
 
 #: build/trans_presets.java:2832
@@ -30356,18 +30339,15 @@
 
 #: build/trans_presets.java:2832
-#, fuzzy
 msgid "billboard"
-msgstr "Stĺpik"
+msgstr ""
 
 #. item "Amenities/Clock" combo "Visibility/readability"
 #: build/trans_presets.java:2833
-#, fuzzy
 msgid "Visibility/readability"
-msgstr "Viditeľnosť"
+msgstr ""
 
 #: build/trans_presets.java:2833
-#, fuzzy
 msgid "(up to 5m)"
-msgstr "až do dlaždice"
+msgstr ""
 
 #: build/trans_presets.java:2833
@@ -30381,7 +30361,6 @@
 #. item "Amenities/Clock" check "Shows current date"
 #: build/trans_presets.java:2834
-#, fuzzy
 msgid "Shows current date"
-msgstr "Uložiť aktuálne dáta."
+msgstr ""
 
 #. item "Amenities/Clock" check "Shows temperature"
@@ -30397,7 +30376,6 @@
 #. item "Amenities/Clock" check "Shows humidity"
 #: build/trans_presets.java:2837
-#, fuzzy
 msgid "Shows humidity"
-msgstr "Zobraz históriu"
+msgstr ""
 
 #. </optional>
@@ -36463,4 +36441,12 @@
 msgid "PCN 2006 - Italy"
 msgstr ""
+
+#.
+#. only for France
+#. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html
+#: build/trans_wms.java:52
+#, fuzzy
+msgid "SPOTMaps (France)"
+msgstr "UTM France (DOM)"
 
 #~ msgid "Move"
Index: /applications/editors/josm/i18n/po/sl.po
===================================================================
--- /applications/editors/josm/i18n/po/sl.po	(revision 23466)
+++ /applications/editors/josm/i18n/po/sl.po	(revision 23467)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-01 19:14+0200\n"
-"PO-Revision-Date: 2010-09-02 21:51+0000\n"
+"POT-Creation-Date: 2010-10-03 22:45+0200\n"
+"PO-Revision-Date: 2010-10-01 20:36+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -17,5 +17,5 @@
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
 "%100==4 ? 3 : 0);\n"
-"X-Launchpad-Export-Date: 2010-10-01 16:23+0000\n"
+"X-Launchpad-Export-Date: 2010-10-03 20:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -86,5 +86,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:251
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:515
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:186
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121
@@ -223,5 +223,4 @@
 
 #. Strings in JFileChooser
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
@@ -272,7 +271,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:995
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:992
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119
@@ -297,5 +296,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
-#: build/specialmessages.java:33 build/specialmessages.java:90
+#: build/specialmessages.java:33
 msgid "Cancel"
 msgstr "Prekliči"
@@ -415,5 +414,5 @@
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:42
-#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:40
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -664,5 +663,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:145
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:509
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
@@ -1538,6 +1537,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:112
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:834
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:844
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:831
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:841
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:64
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:78
@@ -1601,5 +1600,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
-#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1327
+#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1340
 #: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1406
 #: build/specialmessages.java:65
@@ -1710,5 +1709,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
-#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1300
+#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1313
 #: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1382
 msgid "Close"
@@ -1761,5 +1760,4 @@
 msgstr "Izberite vsaj eno pot, ki jo želite poenostaviti."
 
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
@@ -1767,5 +1765,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:87
-#: build/specialmessages.java:88
 msgid "Yes"
 msgstr ""
@@ -2475,5 +2472,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:783
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:108
@@ -2876,41 +2873,41 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:459
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:449
 #, java-format
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:641
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:631
 #, java-format
 msgid "Unexpected token. Expected {0}, found {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:656
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:646
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:667
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:657
 msgid "Missing parameter for OR"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:692
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:682
 msgid "Missing operator for NOT"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:689
+msgid "Primitive id expected"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:691
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:694
+msgid "Range of numbers expected"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:697
+msgid "Changeset id expected"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:699
-msgid "Primitive id expected"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:701
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:704
-msgid "Range of numbers expected"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:707
-msgid "Changeset id expected"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:709
 msgid "Version expected"
 msgstr ""
@@ -2967,5 +2964,4 @@
 
 #. Strings in JFileChooser
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
@@ -2996,5 +2992,5 @@
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:686
-#: build/specialmessages.java:58 build/specialmessages.java:87
+#: build/specialmessages.java:58
 msgid "OK"
 msgstr "V redu"
@@ -3587,5 +3583,5 @@
 msgstr "V"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:243
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:258
 #, java-format
 msgid ""
@@ -3593,5 +3589,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:651
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:666
 #, java-format
 msgid ""
@@ -4437,5 +4433,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
 msgid "Presets"
@@ -6375,5 +6371,5 @@
 #. item "Highways/Streets/Roundabout" text "Name"
 #. <space />
-#. <key key="bridge" value="yes" />
+#. unparsed line             <combo key="bridge" values="yes,viaduct,swing,aqueduct" required="true" default="yes" text="Bridge" />
 #. <optional>
 #. item "Highways/Streets/Bridge" text "Name"
@@ -7668,5 +7664,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:572
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:639
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:146
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:143
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
 msgid "<different>"
@@ -9085,9 +9081,7 @@
 msgstr ""
 
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
-#: build/specialmessages.java:89
 msgid "No"
 msgstr ""
@@ -11936,5 +11930,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:489
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:512
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:514
 msgid "Please select an entry."
 msgstr ""
@@ -12351,38 +12345,38 @@
 msgstr "Prednastavljene oznake"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:266
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:270
 msgid "Actions"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:396
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:418
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:400
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:422
 msgid "Separator"
 msgstr "Ločilo"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:580
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:584
 msgid "Toolbar"
 msgstr "Orodjarna"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:584
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:588
 msgid "Available"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:623
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:627
 msgid "Action parameters"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:624
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:628
 msgid "Parameter name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:625
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:629
 msgid "Parameter value"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:630
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:634
 msgid "Toolbar customization"
 msgstr "Prilagoditev orodjarne"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:631
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:635
 msgid "Customize the elements on the toolbar."
 msgstr "Prilagodite si gumbe v orodjarni"
@@ -12688,5 +12682,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:384
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:381
 #, java-format
 msgid ""
@@ -12695,49 +12689,49 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:514
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:511
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:314
 msgid "More information about this feature"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:551
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:548
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:605
+msgid "Available roles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:606
+msgid "role"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607
+msgid "count"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:608
-msgid "Available roles"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:609
-msgid "role"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:610
-msgid "count"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:611
 msgid "elements"
 msgstr ""
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:626
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:623
 msgid "Optional Attributes:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:724
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:721
 #, java-format
 msgid "Unknown type: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:792
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:789
 msgid "Preset role element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:800
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:797
 msgid "Preset sub element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:833
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:830
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -12747,15 +12741,15 @@
 msgstr "Vira prednastavitev ni bilo mogoče prebrati: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:843
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:840
 #, java-format
 msgid "Error parsing {0}: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:884
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:881
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:980
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:977
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -12767,22 +12761,22 @@
 msgstr[3] "Spremeni {0} predmete"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:983
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:980
 msgid "Nothing selected!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:985
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:982
 msgid "Selection unsuitable!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:995
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:992
 msgid "Apply Preset"
 msgstr "Uporabi prednastavitev"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
 msgid "New relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1083
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1080
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -12811,9 +12805,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:273
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:278
 msgid "Show only applicable to selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:295
 msgid "Search in tags"
 msgstr ""
@@ -17940,4 +17934,15 @@
 msgstr ""
 
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:40
+#, fuzzy
+msgid "Seamap Editor"
+msgstr "Ločilo"
+
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#, fuzzy
+msgid "Seanap Editor"
+msgstr "Ločilo"
+
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:38
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
@@ -19916,5 +19921,5 @@
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:90
 #, java-format
 msgid "{0} {1}% of GPS track"
@@ -20204,6 +20209,7 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88
-msgid "Get Capabilities"
-msgstr ""
+#, fuzzy
+msgid "Get Layers"
+msgstr "Plasti"
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124
@@ -20215,10 +20221,7 @@
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:126
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:161
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:236
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:254
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:273
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:277
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:310
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:222
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:244
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:262
 msgid "WMS Error"
 msgstr ""
@@ -20238,17 +20241,14 @@
 msgstr "Povezava do WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:235
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:221
+msgid "Could not parse WMS layer list."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:243
 msgid "Invalid service URL."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:253
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:261
 msgid "Could not retrieve WMS layer list."
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:272
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:276
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:280
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:309
-msgid "Could not parse WMS layer list."
 msgstr ""
 
@@ -25467,7 +25467,6 @@
 
 #: build/trans_presets.java:1506
-#, fuzzy
 msgid "used"
-msgstr "uporaba"
+msgstr ""
 
 #: build/trans_presets.java:1508 build/trans_presets.java:1509
@@ -28671,7 +28670,6 @@
 #. item "Man Made/Mineshaft" label "Edit Mineshaft"
 #: build/trans_presets.java:2722
-#, fuzzy
 msgid "Edit Mineshaft"
-msgstr "Uredi kinematograf"
+msgstr ""
 
 #. item "Man Made/Mineshaft" text "Depth in meters"
@@ -28942,7 +28940,6 @@
 #. item "Amenities/Clock"
 #: build/trans_presets.java:2825
-#, fuzzy
 msgid "Clock"
-msgstr "Dók"
+msgstr ""
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=clock"
@@ -28950,7 +28947,6 @@
 #. item "Amenities/Clock" label "Edit Clock"
 #: build/trans_presets.java:2828
-#, fuzzy
 msgid "Edit Clock"
-msgstr "Uredi dók"
+msgstr ""
 
 #. <key key="amenity" value="clock" />
@@ -28958,17 +28954,14 @@
 #. item "Amenities/Clock" combo "Display"
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "Display"
-msgstr "Nastavitve prikaza"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "analog"
-msgstr "Kanal"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "digital"
-msgstr "Uredi železniški tir"
+msgstr ""
 
 #: build/trans_presets.java:2831
@@ -28982,7 +28975,6 @@
 #. item "Amenities/Clock" combo "Support"
 #: build/trans_presets.java:2832
-#, fuzzy
 msgid "Support"
-msgstr "Šport"
+msgstr ""
 
 #: build/trans_presets.java:2832
@@ -28991,7 +28983,6 @@
 
 #: build/trans_presets.java:2832
-#, fuzzy
 msgid "billboard"
-msgstr "Stebriček"
+msgstr ""
 
 #. item "Amenities/Clock" combo "Visibility/readability"
@@ -29014,7 +29005,6 @@
 #. item "Amenities/Clock" check "Shows current date"
 #: build/trans_presets.java:2834
-#, fuzzy
 msgid "Shows current date"
-msgstr "Shrani trenutne podatke"
+msgstr ""
 
 #. item "Amenities/Clock" check "Shows temperature"
@@ -35095,4 +35085,11 @@
 msgstr ""
 
+#.
+#. only for France
+#. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html
+#: build/trans_wms.java:52
+msgid "SPOTMaps (France)"
+msgstr ""
+
 #~ msgid "Move"
 #~ msgstr "Premakni"
Index: /applications/editors/josm/i18n/po/sv.po
===================================================================
--- /applications/editors/josm/i18n/po/sv.po	(revision 23466)
+++ /applications/editors/josm/i18n/po/sv.po	(revision 23467)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-01 19:14+0200\n"
-"PO-Revision-Date: 2010-09-02 22:06+0000\n"
+"POT-Creation-Date: 2010-10-03 22:45+0200\n"
+"PO-Revision-Date: 2010-10-01 19:56+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-10-01 16:27+0000\n"
+"X-Launchpad-Export-Date: 2010-10-03 20:34+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -85,5 +85,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:251
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:515
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:186
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121
@@ -228,5 +228,4 @@
 
 #. Strings in JFileChooser
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
@@ -277,7 +276,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:995
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:992
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119
@@ -302,5 +301,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
-#: build/specialmessages.java:33 build/specialmessages.java:90
+#: build/specialmessages.java:33
 msgid "Cancel"
 msgstr "Avbryt"
@@ -422,5 +421,5 @@
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:42
-#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:40
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -677,5 +676,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:145
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:509
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
@@ -1570,6 +1569,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:112
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:834
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:844
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:831
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:841
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:64
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:78
@@ -1633,5 +1632,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
-#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1327
+#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1340
 #: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1406
 #: build/specialmessages.java:65
@@ -1746,5 +1745,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
-#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1300
+#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1313
 #: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1382
 msgid "Close"
@@ -1797,5 +1796,4 @@
 msgstr "Välj åtminstone en sträcka att förenkla."
 
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
@@ -1803,5 +1801,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:87
-#: build/specialmessages.java:88
 msgid "Yes"
 msgstr "Ja"
@@ -2532,5 +2529,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:783
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:108
@@ -2966,41 +2963,41 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:459
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:449
 #, java-format
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
 msgstr "Okänd primitivtyp: {0}. Tillåtna värden är nod, sträcka eller relation"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:641
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:631
 #, java-format
 msgid "Unexpected token. Expected {0}, found {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:656
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:646
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:667
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:657
 msgid "Missing parameter for OR"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:692
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:682
 msgid "Missing operator for NOT"
 msgstr "Parameter saknar för NOT"
 
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:689
+msgid "Primitive id expected"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:691
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:694
+msgid "Range of numbers expected"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:697
+msgid "Changeset id expected"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:699
-msgid "Primitive id expected"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:701
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:704
-msgid "Range of numbers expected"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:707
-msgid "Changeset id expected"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:709
 msgid "Version expected"
 msgstr ""
@@ -3061,5 +3058,4 @@
 
 #. Strings in JFileChooser
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
@@ -3090,5 +3086,5 @@
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:686
-#: build/specialmessages.java:58 build/specialmessages.java:87
+#: build/specialmessages.java:58
 msgid "OK"
 msgstr "OK"
@@ -3688,5 +3684,5 @@
 msgstr "Ö"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:243
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:258
 #, java-format
 msgid ""
@@ -3694,5 +3690,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:651
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:666
 #, java-format
 msgid ""
@@ -4534,5 +4530,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
 msgid "Presets"
@@ -6475,5 +6471,5 @@
 #. item "Highways/Streets/Roundabout" text "Name"
 #. <space />
-#. <key key="bridge" value="yes" />
+#. unparsed line             <combo key="bridge" values="yes,viaduct,swing,aqueduct" required="true" default="yes" text="Bridge" />
 #. <optional>
 #. item "Highways/Streets/Bridge" text "Name"
@@ -7768,5 +7764,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:572
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:639
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:146
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:143
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
 msgid "<different>"
@@ -9187,9 +9183,7 @@
 msgstr ""
 
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
-#: build/specialmessages.java:89
 msgid "No"
 msgstr ""
@@ -12083,5 +12077,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:489
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:512
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:514
 msgid "Please select an entry."
 msgstr "Välj en post."
@@ -12502,38 +12496,38 @@
 msgstr "Snabbval för taggning"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:266
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:270
 msgid "Actions"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:396
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:418
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:400
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:422
 msgid "Separator"
 msgstr "Avgränsare"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:580
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:584
 msgid "Toolbar"
 msgstr "Verktygsrad"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:584
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:588
 msgid "Available"
 msgstr "Tillgänglig"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:623
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:627
 msgid "Action parameters"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:624
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:628
 msgid "Parameter name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:625
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:629
 msgid "Parameter value"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:630
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:634
 msgid "Toolbar customization"
 msgstr "Inställning av verktygsrad"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:631
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:635
 msgid "Customize the elements on the toolbar."
 msgstr "Bestäm vad som skall finnas på verktygsraden."
@@ -12839,5 +12833,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:384
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:381
 #, java-format
 msgid ""
@@ -12846,49 +12840,49 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:514
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:511
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:314
 msgid "More information about this feature"
 msgstr "Mer information om denna funktion"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:551
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:548
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:605
+msgid "Available roles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:606
+msgid "role"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607
+msgid "count"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:608
-msgid "Available roles"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:609
-msgid "role"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:610
-msgid "count"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:611
 msgid "elements"
 msgstr ""
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:626
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:623
 msgid "Optional Attributes:"
 msgstr "Valfria attribut:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:724
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:721
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Okänd typ: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:792
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:789
 msgid "Preset role element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:800
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:797
 msgid "Preset sub element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:833
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:830
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -12898,15 +12892,15 @@
 msgstr "Kunde inte läsa källan till snabbval för taggning: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:843
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:840
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Fel vid tolkning {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:884
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:881
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Objekt av typ {0} stöds."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:980
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:977
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -12916,22 +12910,22 @@
 msgstr[1] "Ändra {0} objekt"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:983
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:980
 msgid "Nothing selected!"
 msgstr "Inget markerat!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:985
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:982
 msgid "Selection unsuitable!"
 msgstr "Urvalet passar inte!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:995
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:992
 msgid "Apply Preset"
 msgstr "Tillämpa snabbval"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
 msgid "New relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1083
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1080
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -12960,9 +12954,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:273
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:278
 msgid "Show only applicable to selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:295
 msgid "Search in tags"
 msgstr ""
@@ -18134,4 +18128,15 @@
 msgstr "Tona bakgrund: "
 
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:40
+#, fuzzy
+msgid "Seamap Editor"
+msgstr "Avgränsare"
+
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#, fuzzy
+msgid "Seanap Editor"
+msgstr "Avgränsare"
+
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:38
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
@@ -20139,5 +20144,5 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:90
 #, java-format
 msgid "{0} {1}% of GPS track"
@@ -20427,6 +20432,7 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88
-msgid "Get Capabilities"
-msgstr ""
+#, fuzzy
+msgid "Get Layers"
+msgstr "Lager"
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124
@@ -20438,10 +20444,7 @@
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:126
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:161
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:236
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:254
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:273
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:277
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:310
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:222
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:244
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:262
 msgid "WMS Error"
 msgstr ""
@@ -20461,17 +20464,14 @@
 msgstr "URL för WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:235
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:221
+msgid "Could not parse WMS layer list."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:243
 msgid "Invalid service URL."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:253
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:261
 msgid "Could not retrieve WMS layer list."
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:272
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:276
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:280
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:309
-msgid "Could not parse WMS layer list."
 msgstr ""
 
@@ -22845,7 +22845,6 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. axleload (tonnes)"
 #: build/trans_presets.java:416
-#, fuzzy
 msgid "Max. axleload (tonnes)"
-msgstr "Största tillåtna vikt (ton)"
+msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
@@ -25698,7 +25697,6 @@
 
 #: build/trans_presets.java:1506
-#, fuzzy
 msgid "used"
-msgstr "användning"
+msgstr ""
 
 #: build/trans_presets.java:1508 build/trans_presets.java:1509
@@ -25707,7 +25705,6 @@
 
 #: build/trans_presets.java:1508 build/trans_presets.java:1509
-#, fuzzy
 msgid "oldtimer"
-msgstr "tiger"
+msgstr ""
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Parts"
@@ -26323,7 +26320,6 @@
 
 #: build/trans_presets.java:1828
-#, fuzzy
 msgid "interval"
-msgstr "industri"
+msgstr ""
 
 #. item "Travel/Accomodation/Caravan Site" check "Power supply"
@@ -26334,7 +26330,6 @@
 #. item "Travel/Accomodation/Caravan Site" check "Tents allowed"
 #: build/trans_presets.java:1830
-#, fuzzy
 msgid "Tents allowed"
-msgstr "Enbart två noder kan vara valda"
+msgstr ""
 
 #. item "Travel/Accomodation/Camping Site"
@@ -28905,13 +28900,11 @@
 #. item "Man Made/Mineshaft" label "Edit Mineshaft"
 #: build/trans_presets.java:2722
-#, fuzzy
 msgid "Edit Mineshaft"
-msgstr "Redigera en småbåtshamn"
+msgstr ""
 
 #. item "Man Made/Mineshaft" text "Depth in meters"
 #: build/trans_presets.java:2725
-#, fuzzy
 msgid "Depth in meters"
-msgstr "Bredd (meter)"
+msgstr ""
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
@@ -29177,7 +29170,6 @@
 #. item "Amenities/Clock"
 #: build/trans_presets.java:2825
-#, fuzzy
 msgid "Clock"
-msgstr "Docka"
+msgstr ""
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=clock"
@@ -29185,7 +29177,6 @@
 #. item "Amenities/Clock" label "Edit Clock"
 #: build/trans_presets.java:2828
-#, fuzzy
 msgid "Edit Clock"
-msgstr "Redigera en docka"
+msgstr ""
 
 #. <key key="amenity" value="clock" />
@@ -29193,33 +29184,27 @@
 #. item "Amenities/Clock" combo "Display"
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "Display"
-msgstr "ö"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "analog"
-msgstr "Kanal"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "digital"
-msgstr "Redigera en järnväg"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "sundial"
-msgstr "sunnimuslimer"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "unorthodox"
-msgstr "ortodoxa"
+msgstr ""
 
 #. item "Amenities/Clock" combo "Support"
 #: build/trans_presets.java:2832
-#, fuzzy
 msgid "Support"
-msgstr "Sport"
+msgstr ""
 
 #: build/trans_presets.java:2832
@@ -29228,7 +29213,6 @@
 
 #: build/trans_presets.java:2832
-#, fuzzy
 msgid "billboard"
-msgstr "Trafikkon"
+msgstr ""
 
 #. item "Amenities/Clock" combo "Visibility/readability"
@@ -29251,7 +29235,6 @@
 #. item "Amenities/Clock" check "Shows current date"
 #: build/trans_presets.java:2834
-#, fuzzy
 msgid "Shows current date"
-msgstr "Spara nuvarande data."
+msgstr ""
 
 #. item "Amenities/Clock" check "Shows temperature"
@@ -35330,4 +35313,11 @@
 #: build/trans_wms.java:49
 msgid "PCN 2006 - Italy"
+msgstr ""
+
+#.
+#. only for France
+#. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html
+#: build/trans_wms.java:52
+msgid "SPOTMaps (France)"
 msgstr ""
 
Index: /applications/editors/josm/i18n/po/tr.po
===================================================================
--- /applications/editors/josm/i18n/po/tr.po	(revision 23466)
+++ /applications/editors/josm/i18n/po/tr.po	(revision 23467)
@@ -10,6 +10,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-01 19:14+0200\n"
-"PO-Revision-Date: 2010-09-25 12:24+0000\n"
+"POT-Creation-Date: 2010-10-03 22:45+0200\n"
+"PO-Revision-Date: 2010-10-01 19:39+0000\n"
 "Last-Translator: Angel Spy <melissadilara@yahoo.com>\n"
 "Language-Team: Türkçe\n"
@@ -18,5 +18,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2010-10-01 16:26+0000\n"
+"X-Launchpad-Export-Date: 2010-10-03 20:34+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -87,5 +87,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:251
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:515
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:186
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121
@@ -226,5 +226,4 @@
 
 #. Strings in JFileChooser
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
@@ -275,7 +274,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:995
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:992
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119
@@ -300,5 +299,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
-#: build/specialmessages.java:33 build/specialmessages.java:90
+#: build/specialmessages.java:33
 msgid "Cancel"
 msgstr "İptal"
@@ -418,5 +417,5 @@
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:42
-#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:40
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -671,5 +670,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:145
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:509
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
@@ -1544,6 +1543,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:112
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:834
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:844
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:831
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:841
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:64
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:78
@@ -1607,5 +1606,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
-#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1327
+#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1340
 #: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1406
 #: build/specialmessages.java:65
@@ -1717,5 +1716,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
-#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1300
+#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1313
 #: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1382
 msgid "Close"
@@ -1768,5 +1767,4 @@
 msgstr "Lütfen basitleştime için en az bir yol seçiniz."
 
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
@@ -1774,5 +1772,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:87
-#: build/specialmessages.java:88
 msgid "Yes"
 msgstr ""
@@ -2483,5 +2480,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:783
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:108
@@ -2889,41 +2886,41 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:459
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:449
 #, java-format
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:641
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:631
 #, java-format
 msgid "Unexpected token. Expected {0}, found {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:656
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:646
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:667
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:657
 msgid "Missing parameter for OR"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:692
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:682
 msgid "Missing operator for NOT"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:689
+msgid "Primitive id expected"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:691
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:694
+msgid "Range of numbers expected"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:697
+msgid "Changeset id expected"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:699
-msgid "Primitive id expected"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:701
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:704
-msgid "Range of numbers expected"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:707
-msgid "Changeset id expected"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:709
 msgid "Version expected"
 msgstr ""
@@ -2980,5 +2977,4 @@
 
 #. Strings in JFileChooser
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
@@ -3009,5 +3005,5 @@
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:686
-#: build/specialmessages.java:58 build/specialmessages.java:87
+#: build/specialmessages.java:58
 msgid "OK"
 msgstr "OK"
@@ -3604,5 +3600,5 @@
 msgstr "D"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:243
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:258
 #, java-format
 msgid ""
@@ -3610,5 +3606,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:651
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:666
 #, java-format
 msgid ""
@@ -4446,5 +4442,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
 msgid "Presets"
@@ -6382,5 +6378,5 @@
 #. item "Highways/Streets/Roundabout" text "Name"
 #. <space />
-#. <key key="bridge" value="yes" />
+#. unparsed line             <combo key="bridge" values="yes,viaduct,swing,aqueduct" required="true" default="yes" text="Bridge" />
 #. <optional>
 #. item "Highways/Streets/Bridge" text "Name"
@@ -7675,5 +7671,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:572
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:639
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:146
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:143
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
 msgid "<different>"
@@ -9084,9 +9080,7 @@
 msgstr ""
 
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
-#: build/specialmessages.java:89
 msgid "No"
 msgstr ""
@@ -11943,5 +11937,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:489
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:512
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:514
 msgid "Please select an entry."
 msgstr "Lütfen bir seçim yapınız."
@@ -12360,38 +12354,38 @@
 msgstr "Etiketleme Ayarları"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:266
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:270
 msgid "Actions"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:396
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:418
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:400
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:422
 msgid "Separator"
 msgstr "Ayıraç"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:580
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:584
 msgid "Toolbar"
 msgstr "Araç Çubuğu"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:584
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:588
 msgid "Available"
 msgstr "Mevcut"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:623
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:627
 msgid "Action parameters"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:624
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:628
 msgid "Parameter name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:625
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:629
 msgid "Parameter value"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:630
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:634
 msgid "Toolbar customization"
 msgstr "Araç Çubuğu Özelleştir"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:631
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:635
 msgid "Customize the elements on the toolbar."
 msgstr "Araç çubuğundaki elemanlar özelleştir."
@@ -12697,5 +12691,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:384
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:381
 #, java-format
 msgid ""
@@ -12704,49 +12698,49 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:514
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:511
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:314
 msgid "More information about this feature"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:551
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:548
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:605
+msgid "Available roles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:606
+msgid "role"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607
+msgid "count"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:608
-msgid "Available roles"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:609
-msgid "role"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:610
-msgid "count"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:611
 msgid "elements"
 msgstr ""
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:626
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:623
 msgid "Optional Attributes:"
 msgstr "Seçilebilen Özellikler:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:724
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:721
 #, java-format
 msgid "Unknown type: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:792
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:789
 msgid "Preset role element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:800
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:797
 msgid "Preset sub element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:833
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:830
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -12756,15 +12750,15 @@
 msgstr "Etiketteki özellikler okunamadı: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:843
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:840
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "İşleme Hatası {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:884
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:881
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:980
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:977
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -12773,22 +12767,22 @@
 msgstr[0] "{0} Objeyi Değiştir"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:983
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:980
 msgid "Nothing selected!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:985
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:982
 msgid "Selection unsuitable!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:995
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:992
 msgid "Apply Preset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
 msgid "New relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1083
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1080
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -12817,9 +12811,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:273
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:278
 msgid "Show only applicable to selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:295
 msgid "Search in tags"
 msgstr ""
@@ -17967,4 +17961,15 @@
 msgstr ""
 
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:40
+#, fuzzy
+msgid "Seamap Editor"
+msgstr "Ayıraç"
+
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#, fuzzy
+msgid "Seanap Editor"
+msgstr "Ayıraç"
+
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:38
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
@@ -19953,5 +19958,5 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:90
 #, java-format
 msgid "{0} {1}% of GPS track"
@@ -20241,6 +20246,7 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88
-msgid "Get Capabilities"
-msgstr ""
+#, fuzzy
+msgid "Get Layers"
+msgstr "Tabakalar"
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124
@@ -20252,10 +20258,7 @@
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:126
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:161
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:236
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:254
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:273
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:277
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:310
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:222
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:244
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:262
 msgid "WMS Error"
 msgstr ""
@@ -20275,17 +20278,14 @@
 msgstr "WMS linki"
 
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:235
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:221
+msgid "Could not parse WMS layer list."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:243
 msgid "Invalid service URL."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:253
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:261
 msgid "Could not retrieve WMS layer list."
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:272
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:276
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:280
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:309
-msgid "Could not parse WMS layer list."
 msgstr ""
 
@@ -22658,7 +22658,6 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. axleload (tonnes)"
 #: build/trans_presets.java:416
-#, fuzzy
 msgid "Max. axleload (tonnes)"
-msgstr "Max. ağırlık (ton)"
+msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
@@ -25511,7 +25510,6 @@
 
 #: build/trans_presets.java:1506
-#, fuzzy
 msgid "used"
-msgstr "kullanım"
+msgstr ""
 
 #: build/trans_presets.java:1508 build/trans_presets.java:1509
@@ -26135,7 +26133,6 @@
 
 #: build/trans_presets.java:1828
-#, fuzzy
 msgid "interval"
-msgstr "endüstri"
+msgstr ""
 
 #. item "Travel/Accomodation/Caravan Site" check "Power supply"
@@ -26146,7 +26143,6 @@
 #. item "Travel/Accomodation/Caravan Site" check "Tents allowed"
 #: build/trans_presets.java:1830
-#, fuzzy
 msgid "Tents allowed"
-msgstr "Sadece iki nokta olabilir"
+msgstr ""
 
 #. item "Travel/Accomodation/Camping Site"
@@ -28717,7 +28713,6 @@
 #. item "Man Made/Mineshaft" label "Edit Mineshaft"
 #: build/trans_presets.java:2722
-#, fuzzy
 msgid "Edit Mineshaft"
-msgstr "Marina düzenle"
+msgstr ""
 
 #. item "Man Made/Mineshaft" text "Depth in meters"
@@ -28988,7 +28983,6 @@
 #. item "Amenities/Clock"
 #: build/trans_presets.java:2825
-#, fuzzy
 msgid "Clock"
-msgstr "Blok"
+msgstr ""
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=clock"
@@ -28996,7 +28990,6 @@
 #. item "Amenities/Clock" label "Edit Clock"
 #: build/trans_presets.java:2828
-#, fuzzy
 msgid "Edit Clock"
-msgstr "iskele düzenle"
+msgstr ""
 
 #. <key key="amenity" value="clock" />
@@ -29004,33 +28997,27 @@
 #. item "Amenities/Clock" combo "Display"
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "Display"
-msgstr "ada"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "analog"
-msgstr "Kanal"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "digital"
-msgstr "Demiryolu düzenle"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "sundial"
-msgstr "sunni"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "unorthodox"
-msgstr "orthodox"
+msgstr ""
 
 #. item "Amenities/Clock" combo "Support"
 #: build/trans_presets.java:2832
-#, fuzzy
 msgid "Support"
-msgstr "Spor"
+msgstr ""
 
 #: build/trans_presets.java:2832
@@ -29039,7 +29026,6 @@
 
 #: build/trans_presets.java:2832
-#, fuzzy
 msgid "billboard"
-msgstr "direk-iskele"
+msgstr ""
 
 #. item "Amenities/Clock" combo "Visibility/readability"
@@ -29062,7 +29048,6 @@
 #. item "Amenities/Clock" check "Shows current date"
 #: build/trans_presets.java:2834
-#, fuzzy
 msgid "Shows current date"
-msgstr "Şimdiki bilgiyi kaydet."
+msgstr ""
 
 #. item "Amenities/Clock" check "Shows temperature"
@@ -35141,4 +35126,11 @@
 #: build/trans_wms.java:49
 msgid "PCN 2006 - Italy"
+msgstr ""
+
+#.
+#. only for France
+#. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html
+#: build/trans_wms.java:52
+msgid "SPOTMaps (France)"
 msgstr ""
 
Index: /applications/editors/josm/i18n/po/uk.po
===================================================================
--- /applications/editors/josm/i18n/po/uk.po	(revision 23466)
+++ /applications/editors/josm/i18n/po/uk.po	(revision 23467)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-01 19:14+0200\n"
-"PO-Revision-Date: 2010-09-27 12:54+0000\n"
+"POT-Creation-Date: 2010-10-03 22:45+0200\n"
+"PO-Revision-Date: 2010-10-02 15:44+0000\n"
 "Last-Translator: andygol <Unknown>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -17,5 +17,5 @@
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2010-10-01 16:28+0000\n"
+"X-Launchpad-Export-Date: 2010-10-03 20:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -86,5 +86,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:251
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:515
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:186
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121
@@ -231,5 +231,4 @@
 
 #. Strings in JFileChooser
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
@@ -280,7 +279,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:995
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:992
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119
@@ -305,5 +304,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
-#: build/specialmessages.java:33 build/specialmessages.java:90
+#: build/specialmessages.java:33
 msgid "Cancel"
 msgstr "Скасувати"
@@ -427,5 +426,5 @@
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:42
-#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:40
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -679,5 +678,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:145
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:509
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
@@ -1608,6 +1607,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:112
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:834
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:844
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:831
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:841
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:64
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:78
@@ -1671,5 +1670,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
-#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1327
+#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1340
 #: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1406
 #: build/specialmessages.java:65
@@ -1785,5 +1784,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
-#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1300
+#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1313
 #: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1382
 msgid "Close"
@@ -1836,5 +1835,4 @@
 msgstr "Виберіть хоча б одну лінію для спрощення."
 
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
@@ -1842,5 +1840,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:87
-#: build/specialmessages.java:88
 msgid "Yes"
 msgstr "Так"
@@ -2607,5 +2604,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:783
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:108
@@ -3053,5 +3050,5 @@
 "використання: ключ=значення"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:459
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:449
 #, java-format
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
@@ -3059,36 +3056,36 @@
 "Невідомий тип елементу: {0}. Дозволені значення: точка, лінія або зв’язко"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:641
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:631
 #, java-format
 msgid "Unexpected token. Expected {0}, found {1}"
 msgstr "епередбачений елемент. Очікувалось {0}, знайдено {1}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:656
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:646
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr "Непередбачена конструкція: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:667
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:657
 msgid "Missing parameter for OR"
 msgstr "Відсутній параметр для OR"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:692
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:682
 msgid "Missing operator for NOT"
 msgstr "Відсутній параметр для NOT"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:699
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:689
 msgid "Primitive id expected"
 msgstr "Очікується ідентифікатор елемента"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:701
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:704
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:691
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:694
 msgid "Range of numbers expected"
 msgstr "Очікується діапазон чисел"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:707
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:697
 msgid "Changeset id expected"
 msgstr "Очікується ідентифікатор набору змін"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:709
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:699
 msgid "Version expected"
 msgstr "Очікується версія"
@@ -3152,5 +3149,4 @@
 
 #. Strings in JFileChooser
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
@@ -3181,5 +3177,5 @@
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:686
-#: build/specialmessages.java:58 build/specialmessages.java:87
+#: build/specialmessages.java:58
 msgid "OK"
 msgstr "Так"
@@ -3816,5 +3812,5 @@
 msgstr "Сх"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:243
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:258
 #, java-format
 msgid ""
@@ -3822,5 +3818,5 @@
 msgstr "Неможливо додати елемент {0} до набору даних, так як він вже присутній"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:651
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:666
 #, java-format
 msgid ""
@@ -4704,5 +4700,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
 msgid "Presets"
@@ -6740,5 +6736,5 @@
 #. item "Highways/Streets/Roundabout" text "Name"
 #. <space />
-#. <key key="bridge" value="yes" />
+#. unparsed line             <combo key="bridge" values="yes,viaduct,swing,aqueduct" required="true" default="yes" text="Bridge" />
 #. <optional>
 #. item "Highways/Streets/Bridge" text "Name"
@@ -8077,5 +8073,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:572
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:639
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:146
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:143
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
 msgid "<different>"
@@ -9611,9 +9607,7 @@
 msgstr "Виберіть ім’я файлу"
 
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
-#: build/specialmessages.java:89
 msgid "No"
 msgstr "Ні"
@@ -12757,5 +12751,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:489
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:512
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:514
 msgid "Please select an entry."
 msgstr "Будь ласка, виберіть запис."
@@ -13215,38 +13209,38 @@
 msgstr "Заготовки теґів"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:266
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:270
 msgid "Actions"
 msgstr "Дії"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:396
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:418
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:400
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:422
 msgid "Separator"
 msgstr "Розділювач"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:580
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:584
 msgid "Toolbar"
 msgstr "Панель інструментів"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:584
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:588
 msgid "Available"
 msgstr "Доступні"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:623
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:627
 msgid "Action parameters"
 msgstr "Параметри дії"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:624
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:628
 msgid "Parameter name"
 msgstr "Назва параметру"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:625
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:629
 msgid "Parameter value"
 msgstr "Значення параметру"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:630
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:634
 msgid "Toolbar customization"
 msgstr "Налаштування панелі інструментів"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:631
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:635
 msgid "Customize the elements on the toolbar."
 msgstr "Налаштувати елементи панелі інструментів."
@@ -13599,5 +13593,5 @@
 msgstr "Додати новий теґ"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:384
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:381
 #, java-format
 msgid ""
@@ -13608,49 +13602,49 @@
 "повинна бути такою ж, як і у values"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:514
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:511
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:314
 msgid "More information about this feature"
 msgstr "Більш детальна інформація про цей елемент"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:551
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:548
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr "Невідомий запит: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:608
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:605
 msgid "Available roles"
 msgstr "Доступні ролі"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:609
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:606
 msgid "role"
 msgstr "роль"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:610
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607
 msgid "count"
 msgstr "кількість"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:611
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:608
 msgid "elements"
 msgstr "елементи"
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:626
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:623
 msgid "Optional Attributes:"
 msgstr "Необов’язкові атрибути:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:724
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:721
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Невідомий тип: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:792
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:789
 msgid "Preset role element without parent"
 msgstr "Роль елемента заготовки без батьків"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:800
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:797
 msgid "Preset sub element without parent"
 msgstr "Вкладені елементи заготовок без батьків"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:833
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:830
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -13660,15 +13654,15 @@
 msgstr "Неможливо прочитати з джерела заготовок теґів: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:843
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:840
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Помилка синтаксичного аналізу: {0} "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:884
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:881
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Елементи типу {0} підтримуються."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:980
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:977
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -13679,22 +13673,22 @@
 msgstr[2] "Правка {0} об’єктів"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:983
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:980
 msgid "Nothing selected!"
 msgstr "Нічого не вибрано!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:985
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:982
 msgid "Selection unsuitable!"
 msgstr "Невдалий вибір!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:995
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:992
 msgid "Apply Preset"
 msgstr "Застосувати заготовку"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
 msgid "New relation"
 msgstr "Новий зв’язок"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1083
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1080
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -13723,9 +13717,9 @@
 msgstr "Заготовки пошуку"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:273
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:278
 msgid "Show only applicable to selection"
 msgstr "Показати тільки ті, що застосовуються для виділеного"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:295
 msgid "Search in tags"
 msgstr "Шукати в теґах"
@@ -19041,11 +19035,10 @@
 
 #: ../plugins/rgisopen/src/rgisopen/RGISLayerFromFileAction.java:34
-#, fuzzy
 msgid "New picture layer from RGIS..."
-msgstr "Новий шар зображення з файлу…"
+msgstr "Новий шар з зображенням з RGIS…"
 
 #: ../plugins/rgisopen/src/rgisopen/RGISOpenPlugin.java:33
 msgid "RGIS"
-msgstr ""
+msgstr "RGIS"
 
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87
@@ -19282,4 +19275,15 @@
 msgid "Fade background: "
 msgstr "Блякле тло: "
+
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:40
+#, fuzzy
+msgid "Seamap Editor"
+msgstr "Редактор Seamark"
+
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#, fuzzy
+msgid "Seanap Editor"
+msgstr "Редактор Seamark"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:38
@@ -21380,5 +21384,5 @@
 msgstr "{0}, …"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:90
 #, java-format
 msgid "{0} {1}% of GPS track"
@@ -21683,6 +21687,6 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88
-msgid "Get Capabilities"
-msgstr "Отримати Можливості"
+msgid "Get Layers"
+msgstr "Отримати шари"
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124
@@ -21696,10 +21700,7 @@
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:126
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:161
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:236
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:254
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:273
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:277
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:310
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:222
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:244
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:262
 msgid "WMS Error"
 msgstr "Помилка WMS"
@@ -21719,18 +21720,15 @@
 msgstr "Посилання на WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:235
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:221
+msgid "Could not parse WMS layer list."
+msgstr "Неможливо здійснити розбір переліку шарів WMS."
+
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:243
 msgid "Invalid service URL."
 msgstr "Помилкове сервісне посилання."
 
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:253
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:261
 msgid "Could not retrieve WMS layer list."
 msgstr "Неможливо отримати перелік шарів WMS."
-
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:272
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:276
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:280
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:309
-msgid "Could not parse WMS layer list."
-msgstr "Неможливо здійснити розбір переліку шарів WMS."
 
 #: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:76
@@ -22677,5 +22675,5 @@
 #: build/trans_plugins.java:78
 msgid "Use rgis.spb.ru image as overlay"
-msgstr ""
+msgstr "Використовувати малюнок з rgis.spb.ru як прошарок"
 
 #. Plugin RoadSigns
@@ -23290,7 +23288,6 @@
 #: build/trans_presets.java:588 build/trans_presets.java:611
 #: build/trans_presets.java:630 build/trans_presets.java:651
-#, fuzzy
 msgid "Lit"
-msgstr "Список"
+msgstr "Освітлення"
 
 #. </optional>
@@ -24192,7 +24189,6 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. axleload (tonnes)"
 #: build/trans_presets.java:416
-#, fuzzy
 msgid "Max. axleload (tonnes)"
-msgstr "Макс. вага (в тоннах)"
+msgstr "Макс. навантаження на вісь (тонн)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
@@ -27045,7 +27041,6 @@
 
 #: build/trans_presets.java:1506
-#, fuzzy
 msgid "used"
-msgstr "не використовується"
+msgstr "використання"
 
 #: build/trans_presets.java:1508 build/trans_presets.java:1509
@@ -27054,7 +27049,6 @@
 
 #: build/trans_presets.java:1508 build/trans_presets.java:1509
-#, fuzzy
 msgid "oldtimer"
-msgstr "каталог"
+msgstr "ретро"
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Parts"
@@ -27662,27 +27656,24 @@
 #: build/trans_presets.java:1827
 msgid "Number of places"
-msgstr ""
+msgstr "Кількість місць"
 
 #. item "Travel/Accomodation/Caravan Site" combo "Requires a fee"
 #: build/trans_presets.java:1828
-#, fuzzy
 msgid "Requires a fee"
-msgstr "Запит не вдався"
+msgstr "Потребує оплати"
 
 #: build/trans_presets.java:1828
-#, fuzzy
 msgid "interval"
-msgstr "промисловість"
+msgstr "інтервал"
 
 #. item "Travel/Accomodation/Caravan Site" check "Power supply"
 #: build/trans_presets.java:1829
 msgid "Power supply"
-msgstr ""
+msgstr "Наявність електрики"
 
 #. item "Travel/Accomodation/Caravan Site" check "Tents allowed"
 #: build/trans_presets.java:1830
-#, fuzzy
 msgid "Tents allowed"
-msgstr "Перевірку не пройдено"
+msgstr "Дозволяються намети"
 
 #. item "Travel/Accomodation/Camping Site"
@@ -30248,18 +30239,16 @@
 #: build/trans_presets.java:2720
 msgid "Mineshaft"
-msgstr ""
+msgstr "Вертикальний тунель"
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dmineshaft" />
 #. item "Man Made/Mineshaft" label "Edit Mineshaft"
 #: build/trans_presets.java:2722
-#, fuzzy
 msgid "Edit Mineshaft"
-msgstr "Властивості Пристані для яхт"
+msgstr "Властивості Вериткального тунелю"
 
 #. item "Man Made/Mineshaft" text "Depth in meters"
 #: build/trans_presets.java:2725
-#, fuzzy
 msgid "Depth in meters"
-msgstr "Параметри дії"
+msgstr "Глибина в метрах"
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
@@ -30525,7 +30514,6 @@
 #. item "Amenities/Clock"
 #: build/trans_presets.java:2825
-#, fuzzy
 msgid "Clock"
-msgstr "Блок"
+msgstr "Годинник"
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=clock"
@@ -30533,7 +30521,6 @@
 #. item "Amenities/Clock" label "Edit Clock"
 #: build/trans_presets.java:2828
-#, fuzzy
 msgid "Edit Clock"
-msgstr "Властивості Доку"
+msgstr "Властивості годинника"
 
 #. <key key="amenity" value="clock" />
@@ -30541,83 +30528,72 @@
 #. item "Amenities/Clock" combo "Display"
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "Display"
-msgstr "відтворити"
+msgstr "Циферблат"
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "analog"
-msgstr "Канал"
+msgstr "аналоговий"
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "digital"
-msgstr "Властивості Рейок"
+msgstr "цифровий"
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "sundial"
-msgstr "суніти"
+msgstr "сонячний годинник"
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "unorthodox"
-msgstr "православ’я"
+msgstr "незвичайний"
 
 #. item "Amenities/Clock" combo "Support"
 #: build/trans_presets.java:2832
-#, fuzzy
 msgid "Support"
-msgstr "Спорт"
+msgstr "Розташуваний на"
 
 #: build/trans_presets.java:2832
 msgid "wall_mounted"
-msgstr ""
+msgstr "стіні"
 
 #: build/trans_presets.java:2832
-#, fuzzy
 msgid "billboard"
-msgstr "Стовпчик"
+msgstr "стенді для оголошень"
 
 #. item "Amenities/Clock" combo "Visibility/readability"
 #: build/trans_presets.java:2833
-#, fuzzy
 msgid "Visibility/readability"
-msgstr "Видимість"
+msgstr "Видно з відстані"
 
 #: build/trans_presets.java:2833
-#, fuzzy
 msgid "(up to 5m)"
-msgstr "до квадрата"
+msgstr "(до 5 м)"
 
 #: build/trans_presets.java:2833
 msgid "(up to 20m)"
-msgstr ""
+msgstr "(до 20 м)"
 
 #: build/trans_presets.java:2833
 msgid "(more than 20m)"
-msgstr ""
+msgstr "(більше ніж 20 м)"
 
 #. item "Amenities/Clock" check "Shows current date"
 #: build/trans_presets.java:2834
-#, fuzzy
 msgid "Shows current date"
-msgstr "Зберегти поточні дані."
+msgstr "Показує поточну дату"
 
 #. item "Amenities/Clock" check "Shows temperature"
 #: build/trans_presets.java:2835
 msgid "Shows temperature"
-msgstr ""
+msgstr "Показує температуру"
 
 #. item "Amenities/Clock" check "Shows barometric pressure"
 #: build/trans_presets.java:2836
 msgid "Shows barometric pressure"
-msgstr ""
+msgstr "Показує атмосферний тиск"
 
 #. item "Amenities/Clock" check "Shows humidity"
 #: build/trans_presets.java:2837
-#, fuzzy
 msgid "Shows humidity"
-msgstr "Показати історію"
+msgstr "Показує вологість"
 
 #. </optional>
@@ -36683,6 +36659,14 @@
 msgstr "PCN 2006 — Італія"
 
-#~ msgid "Plugin for Seamap Editor"
-#~ msgstr "Втулок редактора Seamap"
+#.
+#. only for France
+#. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html
+#: build/trans_wms.java:52
+#, fuzzy
+msgid "SPOTMaps (France)"
+msgstr "Франція UTM (DOM)"
+
+#~ msgid "Get Capabilities"
+#~ msgstr "Отримати Можливості"
 
 #~ msgid "Error: {0}"
@@ -37098,7 +37082,4 @@
 #~ msgstr "Створити зв’язок номеру будинку з вулицею"
 
-#~ msgid "Seamark Editor"
-#~ msgstr "Редактор Seamark"
-
 #~ msgid "8/d"
 #~ msgstr "8 годин на добу"
@@ -37123,7 +37104,7 @@
 #~ "\"{0}\"."
 
-#~ msgid "Get Layers"
-#~ msgstr "Отримати шари"
-
 #~ msgid "Add relation"
 #~ msgstr "Додати зв’язок"
+
+#~ msgid "Plugin for Seamap Editor"
+#~ msgstr "Втулок редактора Seamap"
Index: /applications/editors/josm/i18n/po/zh_CN.po
===================================================================
--- /applications/editors/josm/i18n/po/zh_CN.po	(revision 23466)
+++ /applications/editors/josm/i18n/po/zh_CN.po	(revision 23467)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-01 19:14+0200\n"
-"PO-Revision-Date: 2010-09-25 12:42+0000\n"
+"POT-Creation-Date: 2010-10-03 22:45+0200\n"
+"PO-Revision-Date: 2010-10-01 20:03+0000\n"
 "Last-Translator: bastik <Unknown>\n"
 "Language-Team: Simplified Chinese <zh_CN@li.org>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2010-10-01 16:26+0000\n"
+"X-Launchpad-Export-Date: 2010-10-03 20:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -85,5 +85,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:251
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:515
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:186
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121
@@ -228,5 +228,4 @@
 
 #. Strings in JFileChooser
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
@@ -277,7 +276,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:995
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:992
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119
@@ -302,5 +301,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
-#: build/specialmessages.java:33 build/specialmessages.java:90
+#: build/specialmessages.java:33
 msgid "Cancel"
 msgstr "取消"
@@ -420,5 +419,5 @@
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:42
-#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:40
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -669,5 +668,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:145
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:509
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
@@ -1551,6 +1550,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:112
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:834
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:844
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:831
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:841
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:64
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:78
@@ -1614,5 +1613,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
-#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1327
+#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1340
 #: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1406
 #: build/specialmessages.java:65
@@ -1722,5 +1721,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
-#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1300
+#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1313
 #: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1382
 msgid "Close"
@@ -1773,5 +1772,4 @@
 msgstr "请选择至少一条路径来简化。"
 
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
@@ -1779,5 +1777,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:87
-#: build/specialmessages.java:88
 msgid "Yes"
 msgstr "是"
@@ -2483,5 +2480,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:783
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:108
@@ -2905,41 +2902,41 @@
 msgstr "使用标签(tag)运算子时设定键不能空白。使用范例：key=value"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:459
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:449
 #, java-format
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
 msgstr "不明的原型类型：{0}。允许的数值为node、 way 或relation"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:641
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:631
 #, java-format
 msgid "Unexpected token. Expected {0}, found {1}"
 msgstr "未预期的记号。应该为{0}，却发现{1}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:656
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:646
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr "未预期的记号：{0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:667
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:657
 msgid "Missing parameter for OR"
 msgstr "缺少 OR 的参数"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:692
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:682
 msgid "Missing operator for NOT"
 msgstr "缺少 NOT 的运算子"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:699
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:689
 msgid "Primitive id expected"
 msgstr "预期的原型 id"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:701
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:704
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:691
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:694
 msgid "Range of numbers expected"
 msgstr "预期的数字范围"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:707
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:697
 msgid "Changeset id expected"
 msgstr "预期的更改组合 id"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:709
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:699
 msgid "Version expected"
 msgstr "预期的版本"
@@ -3000,5 +2997,4 @@
 
 #. Strings in JFileChooser
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
@@ -3029,5 +3025,5 @@
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:686
-#: build/specialmessages.java:58 build/specialmessages.java:87
+#: build/specialmessages.java:58
 msgid "OK"
 msgstr "确定"
@@ -3622,5 +3618,5 @@
 msgstr "东"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:243
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:258
 #, java-format
 msgid ""
@@ -3628,5 +3624,5 @@
 msgstr "无法将原型 {0} 加入数据组合，因为它已在其中"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:651
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:666
 #, java-format
 msgid ""
@@ -4465,5 +4461,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
 msgid "Presets"
@@ -6415,5 +6411,5 @@
 #. item "Highways/Streets/Roundabout" text "Name"
 #. <space />
-#. <key key="bridge" value="yes" />
+#. unparsed line             <combo key="bridge" values="yes,viaduct,swing,aqueduct" required="true" default="yes" text="Bridge" />
 #. <optional>
 #. item "Highways/Streets/Bridge" text "Name"
@@ -7726,5 +7722,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:572
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:639
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:146
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:143
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
 msgid "<different>"
@@ -9178,9 +9174,7 @@
 msgstr "选择文件名称"
 
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
-#: build/specialmessages.java:89
 msgid "No"
 msgstr "否"
@@ -12098,5 +12092,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:489
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:512
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:514
 msgid "Please select an entry."
 msgstr "请选择一个项目。"
@@ -12533,38 +12527,38 @@
 msgstr "加上预先组合标签"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:266
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:270
 msgid "Actions"
 msgstr "动作"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:396
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:418
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:400
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:422
 msgid "Separator"
 msgstr "分隔线"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:580
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:584
 msgid "Toolbar"
 msgstr "工具列"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:584
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:588
 msgid "Available"
 msgstr "可用"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:623
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:627
 msgid "Action parameters"
 msgstr "动作参数"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:624
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:628
 msgid "Parameter name"
 msgstr "参数名称"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:625
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:629
 msgid "Parameter value"
 msgstr "参数数值"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:630
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:634
 msgid "Toolbar customization"
 msgstr "工具列自定义化"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:631
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:635
 msgid "Customize the elements on the toolbar."
 msgstr "自定义工具列上的元件。"
@@ -12888,5 +12882,5 @@
 msgstr "加入新标签"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:384
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:381
 #, java-format
 msgid ""
@@ -12896,49 +12890,49 @@
 "损坏的预设组合 \"{0}-{1}\" - 在 display_values 中项目的数量必须和数值里的相同"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:514
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:511
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:314
 msgid "More information about this feature"
 msgstr "更多关于这个功能的信息"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:551
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:548
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr "不明的必需品：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:608
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:605
 msgid "Available roles"
 msgstr "可用的角色"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:609
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:606
 msgid "role"
 msgstr "角色"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:610
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607
 msgid "count"
 msgstr "计次"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:611
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:608
 msgid "elements"
 msgstr "元素"
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:626
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:623
 msgid "Optional Attributes:"
 msgstr "额外属性："
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:724
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:721
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "不明的类型：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:792
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:789
 msgid "Preset role element without parent"
 msgstr "预置无父元素的角色元素"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:800
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:797
 msgid "Preset sub element without parent"
 msgstr "预置无父元素的子元素"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:833
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:830
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -12948,15 +12942,15 @@
 msgstr "无法读取标签预设组合来源：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:843
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:840
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "分析 {0} 时发生错误： "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:884
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:881
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "类型 {0} 的元件已支持。"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:980
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:977
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -12965,22 +12959,22 @@
 msgstr[0] "改变 {0} 个对象"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:983
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:980
 msgid "Nothing selected!"
 msgstr "尚未选择!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:985
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:982
 msgid "Selection unsuitable!"
 msgstr "选择区域不合适!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:995
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:992
 msgid "Apply Preset"
 msgstr "应用预设组合"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
 msgid "New relation"
 msgstr "新建关系"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1083
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1080
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -13009,9 +13003,9 @@
 msgstr "搜索预设组合"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:273
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:278
 msgid "Show only applicable to selection"
 msgstr "只显示可适用的选项"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:295
 msgid "Search in tags"
 msgstr "搜索关键字"
@@ -18063,7 +18057,6 @@
 
 #: ../plugins/rgisopen/src/rgisopen/RGISLayerFromFileAction.java:34
-#, fuzzy
 msgid "New picture layer from RGIS..."
-msgstr "来自文件的新相片图层..."
+msgstr ""
 
 #: ../plugins/rgisopen/src/rgisopen/RGISOpenPlugin.java:33
@@ -18305,4 +18298,15 @@
 msgstr "淡化背景： "
 
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:40
+#, fuzzy
+msgid "Seamap Editor"
+msgstr "分隔线"
+
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#, fuzzy
+msgid "Seanap Editor"
+msgstr "分隔线"
+
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:38
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
@@ -20328,5 +20332,5 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:90
 #, java-format
 msgid "{0} {1}% of GPS track"
@@ -20618,6 +20622,6 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88
-msgid "Get Capabilities"
-msgstr ""
+msgid "Get Layers"
+msgstr "获取图层"
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124
@@ -20629,10 +20633,7 @@
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:126
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:161
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:236
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:254
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:273
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:277
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:310
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:222
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:244
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:262
 msgid "WMS Error"
 msgstr "WMS 错误"
@@ -20652,18 +20653,15 @@
 msgstr "WMS URL"
 
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:235
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:221
+msgid "Could not parse WMS layer list."
+msgstr "无法解析 WMS 图层列表。"
+
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:243
 msgid "Invalid service URL."
 msgstr "无效的服务 URL。"
 
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:253
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:261
 msgid "Could not retrieve WMS layer list."
 msgstr "无法得到 WMS 图层列表。"
-
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:272
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:276
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:280
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:309
-msgid "Could not parse WMS layer list."
-msgstr "无法解析 WMS 图层列表。"
 
 #: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:76
@@ -22162,7 +22160,6 @@
 #: build/trans_presets.java:588 build/trans_presets.java:611
 #: build/trans_presets.java:630 build/trans_presets.java:651
-#, fuzzy
 msgid "Lit"
-msgstr "清单"
+msgstr ""
 
 #. </optional>
@@ -23064,7 +23061,6 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. axleload (tonnes)"
 #: build/trans_presets.java:416
-#, fuzzy
 msgid "Max. axleload (tonnes)"
-msgstr "总重限制 (吨)"
+msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
@@ -25917,7 +25913,6 @@
 
 #: build/trans_presets.java:1506
-#, fuzzy
 msgid "used"
-msgstr "未使用的"
+msgstr ""
 
 #: build/trans_presets.java:1508 build/trans_presets.java:1509
@@ -25926,7 +25921,6 @@
 
 #: build/trans_presets.java:1508 build/trans_presets.java:1509
-#, fuzzy
 msgid "oldtimer"
-msgstr "文件夹"
+msgstr ""
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Parts"
@@ -26538,12 +26532,10 @@
 #. item "Travel/Accomodation/Caravan Site" combo "Requires a fee"
 #: build/trans_presets.java:1828
-#, fuzzy
 msgid "Requires a fee"
-msgstr "要求已失败"
+msgstr ""
 
 #: build/trans_presets.java:1828
-#, fuzzy
 msgid "interval"
-msgstr "产业"
+msgstr ""
 
 #. item "Travel/Accomodation/Caravan Site" check "Power supply"
@@ -26554,7 +26546,6 @@
 #. item "Travel/Accomodation/Caravan Site" check "Tents allowed"
 #: build/trans_presets.java:1830
-#, fuzzy
 msgid "Tents allowed"
-msgstr "测试失败"
+msgstr ""
 
 #. item "Travel/Accomodation/Camping Site"
@@ -29125,13 +29116,11 @@
 #. item "Man Made/Mineshaft" label "Edit Mineshaft"
 #: build/trans_presets.java:2722
-#, fuzzy
 msgid "Edit Mineshaft"
-msgstr "编辑码头"
+msgstr ""
 
 #. item "Man Made/Mineshaft" text "Depth in meters"
 #: build/trans_presets.java:2725
-#, fuzzy
 msgid "Depth in meters"
-msgstr "动作参数"
+msgstr ""
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
@@ -29397,7 +29386,6 @@
 #. item "Amenities/Clock"
 #: build/trans_presets.java:2825
-#, fuzzy
 msgid "Clock"
-msgstr "水泥护栏"
+msgstr ""
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=clock"
@@ -29405,7 +29393,6 @@
 #. item "Amenities/Clock" label "Edit Clock"
 #: build/trans_presets.java:2828
-#, fuzzy
 msgid "Edit Clock"
-msgstr "编辑船坞"
+msgstr ""
 
 #. <key key="amenity" value="clock" />
@@ -29413,33 +29400,27 @@
 #. item "Amenities/Clock" combo "Display"
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "Display"
-msgstr "播放"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "analog"
-msgstr "运河"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "digital"
-msgstr "编辑轨道"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "sundial"
-msgstr "逊尼派"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "unorthodox"
-msgstr "东正教"
+msgstr ""
 
 #. item "Amenities/Clock" combo "Support"
 #: build/trans_presets.java:2832
-#, fuzzy
 msgid "Support"
-msgstr "运动"
+msgstr ""
 
 #: build/trans_presets.java:2832
@@ -29448,18 +29429,15 @@
 
 #: build/trans_presets.java:2832
-#, fuzzy
 msgid "billboard"
-msgstr "车阻柱"
+msgstr ""
 
 #. item "Amenities/Clock" combo "Visibility/readability"
 #: build/trans_presets.java:2833
-#, fuzzy
 msgid "Visibility/readability"
-msgstr "可见状态"
+msgstr ""
 
 #: build/trans_presets.java:2833
-#, fuzzy
 msgid "(up to 5m)"
-msgstr "到拼贴"
+msgstr ""
 
 #: build/trans_presets.java:2833
@@ -29473,7 +29451,6 @@
 #. item "Amenities/Clock" check "Shows current date"
 #: build/trans_presets.java:2834
-#, fuzzy
 msgid "Shows current date"
-msgstr "保存当前数据."
+msgstr ""
 
 #. item "Amenities/Clock" check "Shows temperature"
@@ -29489,7 +29466,6 @@
 #. item "Amenities/Clock" check "Shows humidity"
 #: build/trans_presets.java:2837
-#, fuzzy
 msgid "Shows humidity"
-msgstr "显示历史记录"
+msgstr ""
 
 #. </optional>
@@ -35555,4 +35531,11 @@
 msgstr ""
 
+#.
+#. only for France
+#. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html
+#: build/trans_wms.java:52
+msgid "SPOTMaps (France)"
+msgstr ""
+
 #~ msgid "Solve Conflicts"
 #~ msgstr "解决冲突"
@@ -35673,5 +35656,2 @@
 #~ msgid "Only up to two areas can be joined at the moment."
 #~ msgstr "目前只能连接两个区域。"
-
-#~ msgid "Get Layers"
-#~ msgstr "获取图层"
Index: /applications/editors/josm/i18n/po/zh_TW.po
===================================================================
--- /applications/editors/josm/i18n/po/zh_TW.po	(revision 23466)
+++ /applications/editors/josm/i18n/po/zh_TW.po	(revision 23467)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-01 19:14+0200\n"
-"PO-Revision-Date: 2010-09-18 17:25+0000\n"
+"POT-Creation-Date: 2010-10-03 22:45+0200\n"
+"PO-Revision-Date: 2010-10-01 19:48+0000\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
 "Language-Team: Traditional Chinese\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2010-10-01 16:29+0000\n"
+"X-Launchpad-Export-Date: 2010-10-03 20:34+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: zh_TW\n"
@@ -86,5 +86,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:251
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:515
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:186
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121
@@ -229,5 +229,4 @@
 
 #. Strings in JFileChooser
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
@@ -278,7 +277,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:995
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:992
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119
@@ -303,5 +302,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
-#: build/specialmessages.java:33 build/specialmessages.java:90
+#: build/specialmessages.java:33
 msgid "Cancel"
 msgstr "取消"
@@ -421,5 +420,5 @@
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:42
-#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:40
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -670,5 +669,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:145
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:509
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
@@ -1552,6 +1551,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:112
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:834
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:844
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:831
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:841
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:64
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:78
@@ -1615,5 +1614,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
-#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1327
+#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1340
 #: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1406
 #: build/specialmessages.java:65
@@ -1723,5 +1722,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
-#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1300
+#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1313
 #: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1382
 msgid "Close"
@@ -1774,5 +1773,4 @@
 msgstr "請選擇至少一條路徑來簡化。"
 
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
@@ -1780,5 +1778,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:87
-#: build/specialmessages.java:88
 msgid "Yes"
 msgstr "是"
@@ -2484,5 +2481,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:783
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:108
@@ -2908,41 +2905,41 @@
 msgstr "使用標籤(tag)運算子時設定鍵不能空白。使用範例：key=value"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:459
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:449
 #, java-format
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
 msgstr "不明的原型類型：{0}。允許的數值為 node、 way 或 relation"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:641
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:631
 #, java-format
 msgid "Unexpected token. Expected {0}, found {1}"
 msgstr "未預期的記號。應該為 {0}，卻發現 {1}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:656
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:646
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr "未預期的記號：{0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:667
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:657
 msgid "Missing parameter for OR"
 msgstr "缺少 OR 的參數"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:692
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:682
 msgid "Missing operator for NOT"
 msgstr "缺少 NOT 的運算子"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:699
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:689
 msgid "Primitive id expected"
 msgstr "預期的原型 id"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:701
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:704
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:691
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:694
 msgid "Range of numbers expected"
 msgstr "預期的數字範圍"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:707
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:697
 msgid "Changeset id expected"
 msgstr "預期的變更組合 id"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:709
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:699
 msgid "Version expected"
 msgstr "預期的版本"
@@ -3003,5 +3000,4 @@
 
 #. Strings in JFileChooser
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
@@ -3032,5 +3028,5 @@
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:686
-#: build/specialmessages.java:58 build/specialmessages.java:87
+#: build/specialmessages.java:58
 msgid "OK"
 msgstr "確定"
@@ -3622,5 +3618,5 @@
 msgstr "東"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:243
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:258
 #, java-format
 msgid ""
@@ -3628,5 +3624,5 @@
 msgstr "無法將原型 {0} 加入資料組合，因為它已在其中"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:651
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:666
 #, java-format
 msgid ""
@@ -4467,5 +4463,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
 msgid "Presets"
@@ -6421,5 +6417,5 @@
 #. item "Highways/Streets/Roundabout" text "Name"
 #. <space />
-#. <key key="bridge" value="yes" />
+#. unparsed line             <combo key="bridge" values="yes,viaduct,swing,aqueduct" required="true" default="yes" text="Bridge" />
 #. <optional>
 #. item "Highways/Streets/Bridge" text "Name"
@@ -7732,5 +7728,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:572
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:639
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:146
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:143
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
 msgid "<different>"
@@ -9184,9 +9180,7 @@
 msgstr "選擇檔案名稱"
 
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
-#: build/specialmessages.java:89
 msgid "No"
 msgstr "否"
@@ -12095,5 +12089,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:489
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:512
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:514
 msgid "Please select an entry."
 msgstr "請選擇一個項目。"
@@ -12527,38 +12521,38 @@
 msgstr "加上預先組合標籤"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:266
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:270
 msgid "Actions"
 msgstr "動作"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:396
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:418
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:400
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:422
 msgid "Separator"
 msgstr "分隔線"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:580
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:584
 msgid "Toolbar"
 msgstr "工具列"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:584
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:588
 msgid "Available"
 msgstr "可用"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:623
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:627
 msgid "Action parameters"
 msgstr "動作參數"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:624
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:628
 msgid "Parameter name"
 msgstr "參數名稱"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:625
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:629
 msgid "Parameter value"
 msgstr "參數數值"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:630
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:634
 msgid "Toolbar customization"
 msgstr "工具列自訂化"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:631
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:635
 msgid "Customize the elements on the toolbar."
 msgstr "自訂工具列上的元件。"
@@ -12882,5 +12876,5 @@
 msgstr "加入新標籤"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:384
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:381
 #, java-format
 msgid ""
@@ -12890,49 +12884,49 @@
 "損壞的預設組合 \"{0}-{1}\" - 在 display_values 中項目的數量必須和數值裡的相同"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:514
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:511
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:314
 msgid "More information about this feature"
 msgstr "更多關於這個功能的資訊"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:551
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:548
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr "不明的必需品：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:608
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:605
 msgid "Available roles"
 msgstr "可用的角色"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:609
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:606
 msgid "role"
 msgstr "角色"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:610
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607
 msgid "count"
 msgstr "計次"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:611
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:608
 msgid "elements"
 msgstr "元素"
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:626
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:623
 msgid "Optional Attributes:"
 msgstr "額外屬性："
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:724
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:721
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "不明的類型：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:792
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:789
 msgid "Preset role element without parent"
 msgstr "沒有父項的預設組合角色元素"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:800
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:797
 msgid "Preset sub element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:833
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:830
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -12942,15 +12936,15 @@
 msgstr "無法讀取標籤預設組合來源：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:843
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:840
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "分析 {0} 時發生錯誤： "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:884
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:881
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "類型 {0} 的元件已支援。"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:980
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:977
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -12959,22 +12953,22 @@
 msgstr[0] "改變 {0} 個物件"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:983
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:980
 msgid "Nothing selected!"
 msgstr "尚未選擇！"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:985
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:982
 msgid "Selection unsuitable!"
 msgstr "選擇區域不合適！"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:995
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:992
 msgid "Apply Preset"
 msgstr "套用預設組合"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
 msgid "New relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1083
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1080
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -13003,9 +12997,9 @@
 msgstr "搜尋預設組合"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:273
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:278
 msgid "Show only applicable to selection"
 msgstr "只顯示適合選擇區域"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:295
 msgid "Search in tags"
 msgstr "搜尋標籤"
@@ -18059,7 +18053,6 @@
 
 #: ../plugins/rgisopen/src/rgisopen/RGISLayerFromFileAction.java:34
-#, fuzzy
 msgid "New picture layer from RGIS..."
-msgstr "來自檔案的新相片圖層..."
+msgstr ""
 
 #: ../plugins/rgisopen/src/rgisopen/RGISOpenPlugin.java:33
@@ -18301,4 +18294,15 @@
 msgstr "淡化背景： "
 
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:40
+#, fuzzy
+msgid "Seamap Editor"
+msgstr "分隔線"
+
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#, fuzzy
+msgid "Seanap Editor"
+msgstr "分隔線"
+
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:38
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
@@ -20322,5 +20326,5 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:90
 #, java-format
 msgid "{0} {1}% of GPS track"
@@ -20615,6 +20619,7 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88
-msgid "Get Capabilities"
-msgstr ""
+#, fuzzy
+msgid "Get Layers"
+msgstr "圖層"
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124
@@ -20626,10 +20631,7 @@
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:126
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:161
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:236
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:254
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:273
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:277
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:310
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:222
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:244
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:262
 msgid "WMS Error"
 msgstr ""
@@ -20649,17 +20651,14 @@
 msgstr "WMS URL"
 
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:235
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:221
+msgid "Could not parse WMS layer list."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:243
 msgid "Invalid service URL."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:253
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:261
 msgid "Could not retrieve WMS layer list."
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:272
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:276
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:280
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:309
-msgid "Could not parse WMS layer list."
 msgstr ""
 
@@ -22163,7 +22162,6 @@
 #: build/trans_presets.java:588 build/trans_presets.java:611
 #: build/trans_presets.java:630 build/trans_presets.java:651
-#, fuzzy
 msgid "Lit"
-msgstr "清單"
+msgstr ""
 
 #. </optional>
@@ -23065,7 +23063,6 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. axleload (tonnes)"
 #: build/trans_presets.java:416
-#, fuzzy
 msgid "Max. axleload (tonnes)"
-msgstr "總重限制（噸）"
+msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
@@ -25918,7 +25915,6 @@
 
 #: build/trans_presets.java:1506
-#, fuzzy
 msgid "used"
-msgstr "未使用的"
+msgstr ""
 
 #: build/trans_presets.java:1508 build/trans_presets.java:1509
@@ -25927,7 +25923,6 @@
 
 #: build/trans_presets.java:1508 build/trans_presets.java:1509
-#, fuzzy
 msgid "oldtimer"
-msgstr "資料夾"
+msgstr ""
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Parts"
@@ -26539,12 +26534,10 @@
 #. item "Travel/Accomodation/Caravan Site" combo "Requires a fee"
 #: build/trans_presets.java:1828
-#, fuzzy
 msgid "Requires a fee"
-msgstr "要求已失敗"
+msgstr ""
 
 #: build/trans_presets.java:1828
-#, fuzzy
 msgid "interval"
-msgstr "條件"
+msgstr ""
 
 #. item "Travel/Accomodation/Caravan Site" check "Power supply"
@@ -26555,7 +26548,6 @@
 #. item "Travel/Accomodation/Caravan Site" check "Tents allowed"
 #: build/trans_presets.java:1830
-#, fuzzy
 msgid "Tents allowed"
-msgstr "測試失敗"
+msgstr ""
 
 #. item "Travel/Accomodation/Camping Site"
@@ -29126,13 +29118,11 @@
 #. item "Man Made/Mineshaft" label "Edit Mineshaft"
 #: build/trans_presets.java:2722
-#, fuzzy
 msgid "Edit Mineshaft"
-msgstr "編輯碼頭"
+msgstr ""
 
 #. item "Man Made/Mineshaft" text "Depth in meters"
 #: build/trans_presets.java:2725
-#, fuzzy
 msgid "Depth in meters"
-msgstr "動作參數"
+msgstr ""
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
@@ -29398,7 +29388,6 @@
 #. item "Amenities/Clock"
 #: build/trans_presets.java:2825
-#, fuzzy
 msgid "Clock"
-msgstr "水泥護欄"
+msgstr ""
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=clock"
@@ -29406,7 +29395,6 @@
 #. item "Amenities/Clock" label "Edit Clock"
 #: build/trans_presets.java:2828
-#, fuzzy
 msgid "Edit Clock"
-msgstr "編輯船塢"
+msgstr ""
 
 #. <key key="amenity" value="clock" />
@@ -29414,33 +29402,27 @@
 #. item "Amenities/Clock" combo "Display"
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "Display"
-msgstr "播放"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "analog"
-msgstr "運河"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "digital"
-msgstr "編輯軌道"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "sundial"
-msgstr "遜尼派"
+msgstr ""
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "unorthodox"
-msgstr "東正教"
+msgstr ""
 
 #. item "Amenities/Clock" combo "Support"
 #: build/trans_presets.java:2832
-#, fuzzy
 msgid "Support"
-msgstr "運動"
+msgstr ""
 
 #: build/trans_presets.java:2832
@@ -29449,18 +29431,15 @@
 
 #: build/trans_presets.java:2832
-#, fuzzy
 msgid "billboard"
-msgstr "車阻柱"
+msgstr ""
 
 #. item "Amenities/Clock" combo "Visibility/readability"
 #: build/trans_presets.java:2833
-#, fuzzy
 msgid "Visibility/readability"
-msgstr "可見狀態"
+msgstr ""
 
 #: build/trans_presets.java:2833
-#, fuzzy
 msgid "(up to 5m)"
-msgstr "到拼貼"
+msgstr ""
 
 #: build/trans_presets.java:2833
@@ -29474,7 +29453,6 @@
 #. item "Amenities/Clock" check "Shows current date"
 #: build/trans_presets.java:2834
-#, fuzzy
 msgid "Shows current date"
-msgstr "儲存現在的資料"
+msgstr ""
 
 #. item "Amenities/Clock" check "Shows temperature"
@@ -29490,7 +29468,6 @@
 #. item "Amenities/Clock" check "Shows humidity"
 #: build/trans_presets.java:2837
-#, fuzzy
 msgid "Shows humidity"
-msgstr "顯示歷史紀錄"
+msgstr ""
 
 #. </optional>
@@ -35555,4 +35532,12 @@
 msgid "PCN 2006 - Italy"
 msgstr ""
+
+#.
+#. only for France
+#. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html
+#: build/trans_wms.java:52
+#, fuzzy
+msgid "SPOTMaps (France)"
+msgstr "UTM 法國 (DOM)"
 
 #~ msgid "Solve Conflicts"
