Changeset 15802 in osm for applications/editors/josm/i18n/po/sl.po

Timestamp:

2009-06-09T19:04:14+02:00 (17 years ago)

Author:

stoecker

Message:

updated i18n

File:

• applications/editors/josm/i18n/po/sl.po (modified) (216 diffs)

applications/editors/josm/i18n/po/sl.po

@@ -8 +8 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-23 22:22+0200\n"
-"PO-Revision-Date: 2009-05-19 09:31+0000\n"
+"POT-Creation-Date: 2009-06-09 18:51+0200\n"
+"PO-Revision-Date: 2009-05-23 21:45+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -17 +17 @@
 "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: 2009-05-23 20:14+0000\n"
+"X-Launchpad-Export-Date: 2009-06-09 16:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:187
+#: ../core/src/org/openstreetmap/josm/Main.java:189
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 msgid "Creating main GUI"
@@ -26 +26 @@
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:196
+#: ../core/src/org/openstreetmap/josm/Main.java:198
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:296
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:152
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:299
 msgid "Help"
 msgstr "Pomoč"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:259
+#: ../core/src/org/openstreetmap/josm/Main.java:261
 msgid "The projection could not be read from preferences. Using Mercartor"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:347
+#: ../core/src/org/openstreetmap/josm/Main.java:349
 msgid "Hint: Some changes came from uploading new data to the server."
 msgstr ""
@@ -43 +43 @@
 "strežnik."
 
-#: ../core/src/org/openstreetmap/josm/Main.java:348
+#: ../core/src/org/openstreetmap/josm/Main.java:350
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79
 msgid "Unsaved Changes"
 msgstr "Neshranjene spremembe"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:349
+#: ../core/src/org/openstreetmap/josm/Main.java:351
 msgid "There are unsaved changes. Discard the changes and continue?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:350
+#: ../core/src/org/openstreetmap/josm/Main.java:352
 msgid "Save and Exit"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:350
+#: ../core/src/org/openstreetmap/josm/Main.java:352
 msgid "Discard and Exit"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:350
+#: ../core/src/org/openstreetmap/josm/Main.java:352
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:99
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:124
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:79
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:161
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:151
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:72
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:623
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:221
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:129
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:83
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559
@@ -96 +98 @@
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:320
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:319
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:126
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:318
@@ -103 +105 @@
 msgstr "Prekliči"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:376
+#: ../core/src/org/openstreetmap/josm/Main.java:378
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:389
+#: ../core/src/org/openstreetmap/josm/Main.java:391
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
@@ -190 +192 @@
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192
 msgid "Plugins"
 msgstr "Vstavki"
@@ -255 +257 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:245
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:242
 msgid "Align Nodes in Circle"
 msgstr "Razporedi vozliša v krog"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:32
 msgid "Move the selected nodes into a circle."
 msgstr "Premakne izbrana vozlišča tako, da tvorijo krog."
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
@@ -272 +274 @@
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35
@@ -294 +297 @@
 msgstr "Orodje: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:93
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:92
 msgid "Some of the nodes are (almost) in the line"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:180
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:179
 msgid "Please select at least four nodes."
 msgstr "Prosim, izberite vsaj 4 vozlišča."
@@ -331 +334 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:223
 msgid "conflict"
 msgstr "konflikt"
@@ -469 +472 @@
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:293
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:332
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:623
@@ -478 +481 @@
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:216
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:538
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:88
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87
 msgid "Delete"
 msgstr "Izbriši"
@@ -488 +491 @@
 msgstr "Izbriši izbrane predmete."
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:46
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:382
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:99
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36
 msgid "Overwrite"
 msgstr "Prepiši"
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:47
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:382
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98
 msgid "File exists. Overwrite?"
 msgstr "Datoteka obstaja. Jo nadomestim?"
@@ -523 +527 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:69
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:68
 #, java-format
 msgid "File: {0}"
@@ -563 +567 @@
 msgstr "Zaključek dela z aplikacijo."
 
-#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:26
-msgid "OSM Server Files"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:27
-msgid "GPX Files"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:28
-msgid "NMEA-0183 Files"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:43
 msgid ""
@@ -644 +636 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:499
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:503
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:540
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:544
 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:55
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:83
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:337
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:339
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
@@ -657 +649 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:355
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:358
 msgid "Error"
 msgstr "Napaka"
@@ -676 +668 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:145
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:147
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56
@@ -785 +777 @@
 msgstr "Združi {0} vozlišč"
 
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:70
+msgid "Mirror"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
+msgid "Mirror selected nodes and ways."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53
+msgid "Please select at least one node or way."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36
 msgid "up"
@@ -839 +845 @@
 msgstr "neimenovano"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:41
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31
 msgid "Open..."
 msgstr "Odpri ..."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30
 msgid "Open a file."
 msgstr "Odpri datoteko."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:68
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:170
-#, java-format
-msgid "Error while parsing {0}"
-msgstr "Napaka pri razčlenjevanju {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:54
+#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:54
+#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39
+#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:27
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:37
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:43
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:174
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "Ni bilo možno prebrati \"{0}\""
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:95
-#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:108
-#, java-format
-msgid "Unknown file extension: {0}"
-msgstr "Neznana končnica datoteke: {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:123
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:161
-#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:123
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:86
-#, java-format
-msgid "Markers from {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:135
-msgid "Coordinates imported: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:136
-msgid "Malformed sentences: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:137
-msgid "Checksum errors: "
-msgstr ""
-
-#. don't scare the user unneccessarily
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:139
-msgid "Unknown sentences: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:140
-msgid "Zero coordinates: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:144
-msgid "NMEA import success"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:148
-msgid "NMEA import faliure!"
-msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32
@@ -970 +934 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:114
 msgid "Paste"
 msgstr "Prilepi"
@@ -997 +961 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49
 msgid "Preferences"
 msgstr "Nastavitve"
@@ -1041 +1005 @@
 msgstr "Obrni smer poti"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:26
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 msgid "Save"
 msgstr "Shrani"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
 msgid "Save the current data."
 msgstr "Shrani trenutne podatke"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:74
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:35
+#, java-format
+msgid "File {0} exists. Overwrite?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
 msgid ""
 "Internal Error: cannot check conditions for no layer. Please report this as "
@@ -1056 +1025 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:78
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:85
 msgid "No document open so nothing to save."
 msgstr "Dokument ni odprt, zato ni kaj shraniti."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
 msgid "Empty document"
 msgstr "Prazen dokument"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
 msgid "The document contains no data."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
 msgid "Save anyway"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:90
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:148
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:180
 msgid "Conflicts"
 msgstr "V sporu z"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:98
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -1083 +1052 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99
 msgid "Reject Conflicts and Save"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:109
+msgid "Save OSM file"
+msgstr "Shrani datoteko OSM"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:111
 msgid "Save GPX file"
 msgstr "Shrani datoteko GPX"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
-msgid "Save OSM file"
-msgstr "Shrani datoteko OSM"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112
+msgid "Save Layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:122
 msgid "Could not back up file."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:172
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:214
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:185
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:228
 msgid "Unknown file extension."
 msgstr "Neznana končnica datoteke."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:178
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:219
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:191
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233
 msgid "An error occurred while saving."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:188
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:229
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:201
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:243
 msgid "An error occurred while restoring backup file."
 msgstr ""
@@ -1238 +1211 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
 msgid "UnGlue Ways"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51
 msgid "Duplicate nodes that are used by multiple ways."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:79
 msgid "This node is not glued to anything else."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:100
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:99
 msgid "None of these nodes are glued to anything else."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:101
 msgid "None of this way's nodes are glued to anything else."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:110
 msgid "The current selection cannot be used for unglueing."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:112
+msgid "Select either:"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113
-msgid "Select either:"
+msgid "* One tagged node, or"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114
-msgid "* One tagged node, or"
+msgid "* One node that is used by more than one way, or"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115
-msgid "* One node that is used by more than one way, or"
+msgid "* One node that is used by more than one way and one of those ways, or"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
-msgid "* One node that is used by more than one way and one of those ways, or"
+msgid ""
+"* One way that has one or more nodes that are used by more than one way, or"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
 msgid ""
-"* One way that has one or more nodes that are used by more than one way, or"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
-msgid ""
 "* One way and one or more of its nodes that are used by more than one way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119
 msgid ""
 "Note: If a way is selected, this way will get fresh copies of the unglued\n"
@@ -1297 +1270 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:157
 msgid "Unglued Node"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:372
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370
 #, java-format
 msgid "Dupe into {0} nodes"
@@ -1307 +1280 @@
 
 #. only one changeCommand for a way, else garbage will happen
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:396
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394
 #, java-format
 msgid "Dupe {0} nodes into {1} nodes"
@@ -1363 +1336 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:67
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:68
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:69
 msgid "Upload to OSM..."
 msgstr "Pošlji v OSM ..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:68
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:67
 msgid "Upload all changes to the OSM server."
 msgstr "Pošlji vse spremembe na strežnik OSM."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:83
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:82
 msgid "Objects to add:"
 msgstr "Novi predmeti:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:91
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:90
 msgid "Objects to modify:"
 msgstr "Spremenjeni predmeti:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:99
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:98
 msgid "Objects to delete:"
 msgstr "Izbrisani predmeti:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:105
 msgid "Provide a brief comment for the changes you are uploading:"
 msgstr "Vpišite kratek opis sprememb, ki jih pošiljate:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114
 msgid "Upload these changes?"
 msgstr "Pošljem te spremembe?"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116
 msgid "Upload Changes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:139
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:138
 msgid "Nothing to upload. Get some data first."
 msgstr "Ni česa poslati. Najprej pridobite kakšne podatke."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143
 msgid "There are unresolved conflicts. You have to resolve these first."
 msgstr "Obstajajo nerazrešeni konflikti. Razrešite jih."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:165
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164
 msgid "No changes to upload."
 msgstr "Ni sprememb za pošiljanje."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:181
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:180
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380
 msgid "Uploading data"
@@ -1610 +1583 @@
 msgstr "Dodaj in poveži vozlišče v pot"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:885
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:883
 msgid "Create new node."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:888
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:910
+msgid "Select node under cursor."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912
-msgid "Select node under cursor."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:892
 #, java-format
 msgid "Insert new node into way."
@@ -1626 +1599 @@
 msgstr[1] ""
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:899
+msgid "Start new way from last node."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:901
-msgid "Start new way from last node."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:903
 msgid "Continue way from last node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:914
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:924
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:922
 msgid "Finish drawing."
 msgstr ""
@@ -1653 +1626 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Za izbor predmetov v pravokotniku izpustite miškin gumb."
@@ -1662 +1635 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:481
 msgid "Release the mouse button to stop rotating."
 msgstr "Za prenehanje vrtenja izpustite miškin gumb."
@@ -1695 +1668 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:479
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -1702 +1675 @@
 "najbližjo točko."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:483
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -1723 +1696 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:40
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:45
 msgid "Search..."
 msgstr "Išči..."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:40
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:141
 msgid "Search for objects."
 msgstr "Iskanje predmetov."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:66
@@ -1740 +1713 @@
 msgstr "Ni naloženih podatkov."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:57
 msgid "Please enter a search string."
 msgstr "Prosim, vnesite iskalni izraz."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:60
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:61
 msgid "replace selection"
 msgstr "nadomesti izbor"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:61
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:62
 msgid "add to selection"
 msgstr "dodaj v izbor"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:62
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:63
 msgid "remove from selection"
 msgstr "odstrani iz izbora"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:68
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69
 msgid "case sensitive"
 msgstr "upoštevaj velikost črk"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70
 msgid "regular expression"
 msgstr "regularni izraz"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:84
 msgid "<b>Baker Street</b> - 'Baker' and 'Street' in any key or name."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:83
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:85
 msgid "<b>\"Baker Street\"</b> - 'Baker Street' in any key or name."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:86
 msgid "<b>name:Bak</b> - 'Bak' anywhere in the name."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:85
-msgid "<b>-name:Bak</b> - not 'Bak' in the name."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:86
-msgid "<b>foot:</b> - key=foot set to any value."
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:87
-msgid "<u>Special targets:</u>"
+msgid "<b>type=route</b> - key 'type' with value exactly 'route'."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:88
 msgid ""
+"<b>type=*</b> - key 'type' with any value. Try also <b>*=value</b>, "
+"<b>type=</b>, <b>*=*</b>, <b>*=</b>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:89
+msgid "<b>-name:Bak</b> - not 'Bak' in the name."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:90
+msgid "<b>foot:</b> - key=foot set to any value."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91
+msgid "<u>Special targets:</u>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92
+msgid ""
 "<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93
 msgid "<b>user:</b>... - all objects changed by user"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94
 msgid "<b>id:</b>... - object with given ID"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95
 msgid "<b>nodes:</b>... - object with given number of nodes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:96
 msgid "<b>modified</b> - all changed objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97
 msgid "<b>selected</b> - all selected objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99
 msgid "<b>untagged</b> - all untagged objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:96
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:141
 msgid "Search"
 msgstr "Iskanje"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
 msgid "Start Search"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:173
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:175
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "Z iskanjem ''{0}'' ni bilo v izbor dodano ničesar"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:177
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "Z iskanjem ''{0}'' ni bilo iz izbora odstranjeno ničesar"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187
 #, java-format
 msgid "Found {0} matches"
 msgstr "Najdeno {0} zadetkov"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209
 msgid "CS"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209
 msgid "CI"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210
 msgid "RX"
 msgstr ""
@@ -1892 +1875 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:387
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:172
+msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:355
+#, java-format
+msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:493
+#, java-format
+msgid "Unexpected token: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:514
 msgid "Missing arguments for or."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:398
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:525
 msgid "Missing argument for not."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:409
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:536
 msgid "Expected closing parenthesis."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:592
+msgid "Wrong number of parameters for nodes operator."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:595
+#, java-format
+msgid ""
+"Incorrect value of nodes operator: {0}. Nodes operator expects number of "
+"nodes or range, for example nodes:10-20"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:602
+#, java-format
+msgid "Incorrect value of id operator: {0}. Number is expected."
 msgstr ""
 
@@ -1935 +1948 @@
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:273
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:497
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:70
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:69
 msgid "Add"
 msgstr "Dodaj"
@@ -1977 +1990 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:69
+msgid "ChangeRelationMemberRole"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:78
 #, java-format
@@ -1982 +1999 @@
 msgstr "Razreši {0} sporov v {1} predmetih"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81
-#, java-format
-msgid "Delete {1} {0}"
-msgstr "Izbriši {1} {0}"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97
-#, java-format
-msgid "Delete {0} {1}"
-msgstr "Izbriši {0} {1}"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:145
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:152
-msgid "Conflicting relation"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146
-#, java-format
-msgid ""
-"Selection \"{0}\" is used by relation \"{1}\" with role {2}.\n"
-"Delete from relation?"
-msgstr ""
-"Izbrani predmet \"{0}\" je vključen v relacijo \"{1}\" z vlogo {2}.\n"
-"Izbrišem iz relacije?"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570
-msgid "Delete from relation"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153
-#, java-format
-msgid ""
-"Selection \"{0}\" is used by relation \"{1}\".\n"
-"Delete from relation?"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:328
-msgid "Split way segment"
-msgstr ""
-
-#. leave message in one tr() as there is a grammatical connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:347
-msgid ""
-"You are about to delete nodes outside of the area you have downloaded."
-"<br>This can cause problems because other objects (that you don't see) might "
-"use them.<br>Do you really want to delete?"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:122
-msgid "Move"
-msgstr "Premakni"
-
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:122
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:135
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:91
+#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:44
+#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118
+#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
+#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:60
+#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:47
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:112
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
@@ -2049 +2016 @@
 msgstr[3] "vozlišča"
 
-#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66
-msgid "RemoveRelationMember"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:135
-msgid "Rotate"
-msgstr "Zasuk"
-
-#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88
-msgid "Sequence"
-msgstr "Zaporedje"
-
-#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
-msgid "Apply?"
-msgstr "Uveljavim?"
-
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:141
-msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28
-msgid "Relation"
-msgstr "Relacija"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30
-msgid "Old role"
-msgstr "Stara vloga"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:32
-msgid "New role"
-msgstr "Nova vloga"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
-msgid "Old key"
-msgstr "Star ključ"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
-msgid "Old value"
-msgstr "Stara vrednost"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
-msgid "New key"
-msgstr "Nov ključ"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
-msgid "New value"
-msgstr "Nova vrednost"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:39
-msgid "Apply selected changes"
-msgstr "Uveljavi izbrane spremembe"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:40
-msgid "Don't apply changes"
-msgstr "Ne uveljavi sprememb"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:82
-msgid "Please select which property changes you want to apply."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:95
-msgid "Properties of "
-msgstr "Lastnosti "
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:119
-msgid "Roles in relations referring to"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:135
-msgid "Automatic tag correction"
-msgstr "Samodejno popravljanje oznak"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:310
-#, java-format
-msgid "Malformed config file at lines {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:320
-#, java-format
-msgid "Cannot open preferences directory: {0}"
-msgstr "Ni možno odpreti imenika z nastavitvami: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:338
-#, java-format
-msgid "Preferences file had errors. Making backup of old one to {0}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:79
-#, java-format
-msgid "Preferences stored on {0}"
-msgstr "Nastavitve shranjene na {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:82
-#, java-format
-msgid "Could not upload preferences. Reason: {0}"
-msgstr "Nastavitev ni bilo mogoče prenesti. Razlog: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:93
-msgid "Could not load preferences from server."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:34
-msgid "different"
-msgstr "različno"
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15
-msgid "deleted"
-msgstr "izbrisano"
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
-msgid "true"
-msgstr "pravilno"
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
-msgid "false"
-msgstr "napačno"
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20
-msgid "position"
-msgstr "položaj"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30
-msgid "Decimal Degrees"
-msgstr "Decimalne stopinje"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
-msgid "Degrees Minutes Seconds"
-msgstr "Stopinje Minute Sekunde"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
-msgid "S"
-msgstr "J"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
-msgid "N"
-msgstr "S"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
-msgid "W"
-msgstr "Z"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
-msgid "E"
-msgstr "V"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:87
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:83
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:115
-msgid "incomplete"
-msgstr "nepopoln"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
-#, java-format
-msgid "Error: {0}"
-msgstr "Napaka: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
-#, java-format
-msgid "Warning: {0}"
-msgstr "Opozorilo: {0}"
-
+#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:45
+#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:61
+#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:48
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:217
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483
+msgid "way"
+msgid_plural "ways"
+msgstr[0] "poti"
+msgstr[1] "pot"
+msgstr[2] "poti"
+msgstr[3] "poti"
+
+#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:46
+#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:62
+#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:49
 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:87
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:69
@@ -2223 +2044 @@
 msgstr[3] "relacije"
 
+#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:68
+#, java-format
+msgid "Resolve conflicts in coordinates in {0}"
+msgstr ""
+
+#. should not happen
+#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:88
+#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:73
+msgid "cannot resolve undecided conflict"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81
+#, java-format
+msgid "Delete {1} {0}"
+msgstr "Izbriši {1} {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97
+#, java-format
+msgid "Delete {0} {1}"
+msgstr "Izbriši {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153
+msgid "Conflicting relation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147
+#, java-format
+msgid ""
+"Selection \"{0}\" is used by relation \"{1}\" with role {2}.\n"
+"Delete from relation?"
+msgstr ""
+"Izbrani predmet \"{0}\" je vključen v relacijo \"{1}\" z vlogo {2}.\n"
+"Izbrišem iz relacije?"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570
+msgid "Delete from relation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
+#, java-format
+msgid ""
+"Selection \"{0}\" is used by relation \"{1}\".\n"
+"Delete from relation?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:366
+msgid "Split way segment"
+msgstr ""
+
+#. leave message in one tr() as there is a grammatical connection.
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:385
+msgid ""
+"You are about to delete nodes outside of the area you have downloaded."
+"<br>This can cause problems because other objects (that you don't see) might "
+"use them.<br>Do you really want to delete?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:53
+#, java-format
+msgid "Resolve conflicts in deleted state in {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118
+msgid "Move"
+msgstr "Premakni"
+
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:52
+#, java-format
+msgid "Resolve conflicts in member list of of relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66
+msgid "RemoveRelationMember"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
+msgid "Rotate"
+msgstr "Zasuk"
+
+#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88
+msgid "Sequence"
+msgstr "Zaporedje"
+
+#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:84
+#, java-format
+msgid "Resolve {0} tag conflicts in {1} {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:57
+#, java-format
+msgid "Resolve version conflicts for {0} {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52
+#, java-format
+msgid "Resolve conflicts in node list of of way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
+msgid "Apply?"
+msgstr "Uveljavim?"
+
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:141
+msgid ""
+"When reversing this way, the following changes to properties of the way and "
+"its nodes are suggested in order to maintain data consistency."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28
+msgid "Relation"
+msgstr "Relacija"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30
+msgid "Old role"
+msgstr "Stara vloga"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:32
+msgid "New role"
+msgstr "Nova vloga"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
+msgid "Old key"
+msgstr "Star ključ"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
+msgid "Old value"
+msgstr "Stara vrednost"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
+msgid "New key"
+msgstr "Nov ključ"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
+msgid "New value"
+msgstr "Nova vrednost"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:40
+msgid "Apply selected changes"
+msgstr "Uveljavi izbrane spremembe"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41
+msgid "Don't apply changes"
+msgstr "Ne uveljavi sprememb"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:83
+msgid "Please select which property changes you want to apply."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:96
+msgid "Properties of "
+msgstr "Lastnosti "
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:120
+msgid "Roles in relations referring to"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:136
+msgid "Automatic tag correction"
+msgstr "Samodejno popravljanje oznak"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:314
+#, java-format
+msgid "Malformed config file at lines {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:324
+#, java-format
+msgid "Cannot open preferences directory: {0}"
+msgstr "Ni možno odpreti imenika z nastavitvami: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:342
+#, java-format
+msgid "Preferences file had errors. Making backup of old one to {0}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:79
+#, java-format
+msgid "Preferences stored on {0}"
+msgstr "Nastavitve shranjene na {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:82
+#, java-format
+msgid "Could not upload preferences. Reason: {0}"
+msgstr "Nastavitev ni bilo mogoče prenesti. Razlog: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:93
+msgid "Could not load preferences from server."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:34
+msgid "different"
+msgstr "različno"
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:263
+msgid "deleted"
+msgstr "izbrisano"
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
+msgid "true"
+msgstr "pravilno"
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
+msgid "false"
+msgstr "napačno"
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20
+msgid "position"
+msgstr "položaj"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30
+msgid "Decimal Degrees"
+msgstr "Decimalne stopinje"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
+msgid "Degrees Minutes Seconds"
+msgstr "Stopinje Minute Sekunde"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+msgid "S"
+msgstr "J"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+msgid "N"
+msgstr "S"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+msgid "W"
+msgstr "Z"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+msgid "E"
+msgstr "V"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:108
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:83
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:115
+msgid "incomplete"
+msgstr "nepopoln"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
+#, java-format
+msgid "Error: {0}"
+msgstr "Napaka: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
+#, java-format
+msgid "Warning: {0}"
+msgstr "Opozorilo: {0}"
+
 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:101
 #, java-format
@@ -2259 +2333 @@
 msgstr[3] "{0} točke"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:233
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:234
 msgid "Area style way is not closed."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:441
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:442
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789
-msgid "Empty member in relation."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791
+msgid "Empty member in relation."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:546
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:793
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:557
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:802
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:804
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:562
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:564
 msgid "More than one \"from\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:568
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:570
 msgid "More than one \"to\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:574
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:587
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:589
 msgid "More than one \"via\" found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:581
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:594
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Neznana vloga ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602
 msgid "No \"from\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
 msgid "No \"to\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610
 msgid "No \"via\" node or way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:623
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:633
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:637
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:639
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:755
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:757
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:811
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:813
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:822
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:824
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:951
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:959
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:962
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:970
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1011
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1021
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1046
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1219
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1243
 msgid "untagged"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1220
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1244
 msgid "text"
 msgstr "besedilo"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:217
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483
-msgid "way"
-msgid_plural "ways"
-msgstr[0] "poti"
-msgstr[1] "pot"
-msgstr[2] "poti"
-msgstr[3] "poti"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:79
@@ -2414 +2477 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:231
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:138
 msgid "background"
@@ -2483 +2546 @@
 #. setting up the properties table
 #: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:78
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:158
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
@@ -2495 +2559 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:78
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
@@ -2697 +2762 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:144
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:146
 msgid "File"
 msgstr "Datoteka"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:146
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148
 msgid "View"
 msgstr "Pogled"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:147
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:149
 msgid "Tools"
 msgstr "Orodja"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
 msgid "Presets"
 msgstr "Prednastavitve"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
-#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46
+#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48
 #: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:38
 #, java-format
@@ -2725 +2790 @@
 
 #. TODO move code to an "action" like the others?
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:214
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:216
 msgid "Wireframe View"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:216
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:218
 msgid "Toggle Wireframe view"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:242
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:244
 msgid "Full Screen"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:244
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:246
 msgid "Toggle Full Screen view"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:283
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:286
 msgid "Audio"
 msgstr "Zvok"
@@ -2849 +2914 @@
 msgstr ""
 
+#. *
+#. * compare my version of an {@see OsmPrimitive} with their version
+#.
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:17
+msgid "My with Their"
+msgstr ""
+
+#. *
+#. * compare my version of an {@see OsmPrimitive} with the merged version
+#.
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:22
+msgid "My with Merged"
+msgstr ""
+
+#. *
+#. * compare their version of an {@see OsmPrimitive} with the merged veresion
+#.
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:27
+msgid "Their with Merged"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:82
+#, java-format
+msgid "role {0} is not participating in compare pair {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:63
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:124
+msgid "Properties"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:68
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:93
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228
+msgid "Tags"
+msgstr "Oznake"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:73
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:163
+msgid "Nodes"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:78
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:158
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:197
+msgid "Members"
+msgstr "Člani"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94
+msgid "No pending tag conflicts to be resolved"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:97
+#, java-format
+msgid "Tags({0} conflicts)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:98
+#, java-format
+msgid "{0} pending tag conflicts to be resolved"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:104
+msgid "Nodes(resolved)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:105
+msgid ""
+"Merged node list frozen. No pending conflicts in the node list of this way"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:108
+msgid "Nodes(with conflicts)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:109
+msgid "Pending conflicts in the node list of this way"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:113
+msgid "Members(resolved)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:114
+msgid ""
+"Merged member list frozen. No pending conflicts in the member list of this "
+"relation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:117
+msgid "Members(with conflicts)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:118
+msgid "Pending conflicts in the member list of this relation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:125
+msgid "No pending property conflicts"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:128
+msgid "Properties(with conflicts)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:129
+msgid "Pending property conflicts to be resolved"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193
+msgid "Conflict Resolution"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:325
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:377
+#, java-format
+msgid "parameter current out of range: got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:591
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:615
+#, java-format
+msgid "list in role {0} is currently not participating in a compare pair"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:764
+#, java-format
+msgid "unexpected value of parameter \"index\". Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:778
+#, java-format
+msgid "item {0} not found in list"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:220
+msgid "lock scrolling"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:228
+msgid "Compare "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:76
+msgid "My version"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:264
+msgid "List of elements in my dataset, i.e. the local dataset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137
+msgid "Merged version"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:270
+msgid ""
+"List of merged elements. They will replace the my elements when the merge "
+"decisions are applied."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88
+msgid "Their version"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:276
+msgid "List of elements in their dataset, i.e. the server dataset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:409
+msgid "> top"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:411
+msgid "Copy my selected nodes to the start of the merged node list"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:436
+msgid "> bottom"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:438
+msgid "Copy my selected elements to the end of the list of merged elements"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:465
+msgid ""
+"Copy my selected elements before the first selected element in the list of "
+"merged elements"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:499
+msgid ""
+"Copy my selected elements after the first selected element in the list of "
+"merged elements"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:529
+msgid "Copy their selected element to the start of the list of merged elements"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:552
+msgid "Copy their selected elements to the end of the list of merged elements"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:574
+msgid ""
+"Copy their selected elements before the first selected element in the list "
+"of merged elements"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:604
+msgid ""
+"Copy their selected element after the first selected element in the list of "
+"merged elements"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:632
+msgid "Up"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:634
+msgid "Move up the selected elements by one position"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:664
+msgid "Down"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:666
+msgid "Move down the selected entries by one position"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
+msgid "Remove"
+msgstr "Odstrani"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:698
+msgid "Remove the selected entries from the list of merged elements"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:727
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:764
+msgid "Freeze"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:728
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:765
+msgid "Freeze the current list of merged elements"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:760
+msgid "Unfreeze"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:761
+msgid "Unfreeze the list of merged elements and start merging"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:788
+#, java-format
+msgid ""
+"<html>Click <strong>{0}</strong> to start merging my and their entries</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:793
+#, java-format
+msgid ""
+"<html>Click <strong>{0}</strong> to finish merging my and their entries</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:812
+#, java-format
+msgid "My version ({0} entry)"
+msgid_plural "My version ({0} entries)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:815
+#, java-format
+msgid "Merged version ({0} entry)"
+msgid_plural "Merged version ({0} entries)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:818
+#, java-format
+msgid "Their version ({0} entry)"
+msgid_plural "Their version ({0} entries)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:881
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:922
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:924
+#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:33
+#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:67
+#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:69
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:74
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:76
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:120
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:122
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:35
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:54
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:55
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:56
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:76
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:106
+msgid "parameter '{0}' must not be null"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884
+#, java-format
+msgid ""
+"adjustable {0} not registered yet. Can't set participation in synchronized "
+"adjustment"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:899
+#, java-format
+msgid "adjustable {0} not registered yet"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListColumnModel.java:27
+msgid "Node"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:71
+msgid "Merged nodes not frozen yet. Can't build resolution command"
+msgstr ""
+
+#. should not happen
+#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:210
+#, java-format
+msgid "unexpected column index. Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:77
+msgid "Properties in my dataset, i.e. the local dataset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:83
+msgid ""
+"Properties in the merged element. They will replace properties in my "
+"elements when  merge decisions are applied."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:89
+msgid "Properties in their dataset, i.e. the server dataset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:102
+msgid "Coordinates:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:175
+msgid "Deleted State:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:249
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:261
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28
+msgid "(none)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:265
+msgid "not deleted"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:335
+msgid "Keep my coordiates"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:350
+msgid "Keep their coordiates"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:365
+msgid "Undecide conflict between different coordinates"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:380
+msgid "Keep my deleted state"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:395
+msgid "Keep their deleted state"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:410
+msgid "Undecide conflict between deleted state"
+msgstr ""
+
+#. setting up the member table
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158
+msgid "Role"
+msgstr "Vloga"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:35
+msgid "Primitive"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:124
+msgid "merged nodes not frozen yet. Can't build resolution command"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:37
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:40
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:54
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:57
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:47
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:47
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:60
+msgid "<undefined>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:38
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:41
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:55
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:58
+#, java-format
+msgid "The merged dataset will not include a tag with key {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:48
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:61
+#, java-format
+msgid "My dataset does not include a tag with key {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:108
+msgid "cannot apply undecided tag merge item"
+msgstr ""
+
+#. should not happen, but just in case
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeTableCellRenderer.java:38
+#, java-format
+msgid "Parameter 'col' must be 0 or 1. Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:126
+msgid "My version (local dataset)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:149
+msgid "Their version (server dataset)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:257
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:286
+msgid ">"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:259
+msgid "Keep the selected key/value pairs from the local dataset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:288
+msgid "Keep the selected key/value pairs from the server dataset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:380
+msgid "Undecide"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:382
+msgid "Mark the selected tags as undecided"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:48
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:61
+#, java-format
+msgid "Their dataset does not include a tag with key {0}"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
@@ -2860 +3414 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165
@@ -2889 +3443 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64
 msgid "Resolve"
 msgstr "Razreši"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:65
 msgid "Open a merge dialog of all selected items in the list above."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73
 msgid "Conflict"
 msgstr "Spor"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72
 msgid "Merging conflicts."
 msgstr "Spori pri zlivanju"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118
+msgid "WARNING: unexpected value for preference conflict.resolution, got "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:159
 msgid "Resolve Conflicts"
 msgstr "Razreši spore"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:161
 msgid "Solve Conflict"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:146
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:178
 #, java-format
 msgid "Conflicts: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:129
+msgid "Resolve conflicts"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:150
+msgid "Cancel conflict resolution and close the dialog"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:164
+msgid "Apply resolved conflicts and close the dialog"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:165
+msgid "Apply Resolution"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:173
+msgid "Apply partial resolutions"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:174
+msgid "Continue resolving"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:176
+#, java-format
+msgid ""
+"<html>You didn''t finish to resolve all conflicts.<br>Click <strong>{0}</"
+"strong> to apply already resolved conflicts anyway.<br>You can resolve the "
+"remaining conflicts later.<br>Click <strong>{1}</strong> to return to "
+"resolving conflicts.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:182
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:256
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124
+msgid "Warning"
 msgstr ""
 
@@ -3079 +3677 @@
 msgid "Member Of"
 msgstr ""
-
-#. setting up the member table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158
-msgid "Role"
-msgstr "Vloga"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:568
@@ -3266 +3858 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:197
-msgid "Members"
-msgstr "Člani"
-
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234
 msgid "Move Up"
@@ -3301 +3889 @@
 msgid "Move the currently selected members down"
 msgstr "Pomakni izbranega člana vrstico nižje."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:65
-msgid "Remove"
-msgstr "Odstrani"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:261
@@ -3360 +3941 @@
 #. item "Amenities/Toilets" combo "Fee"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:370
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:408
 #: build/trans_presets.java:312 build/trans_presets.java:313
 #: build/trans_presets.java:314 build/trans_presets.java:315
@@ -3383 +3964 @@
 msgstr "da"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:370
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:408
 #: build/trans_presets.java:312 build/trans_presets.java:313
 #: build/trans_presets.java:314 build/trans_presets.java:315
@@ -3408 +3989 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:372
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:413
 #, java-format
 msgid "Members: {0}"
 msgstr "Člani: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:421
 #, java-format
 msgid "Relation Editor: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:490
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:531
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:265
 msgid "There were conflicts during import."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:498
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:539
 msgid "Error parsing server response."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:502
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:543
 msgid "Cannot connect to server."
 msgstr ""
@@ -3681 +4262 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:256
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124
-msgid "Warning"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:363
 #, java-format
@@ -3725 +4300 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:443
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:245
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:240
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
 msgid "JPEG images (*.jpg)"
@@ -3761 +4336 @@
 msgstr "Vpisanega časa ni bilo mogoče razpoznati."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:217
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
 msgid "gps point"
 msgstr "točka GPS"
 
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186
+msgid "Customize line drawing"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190
+msgid "Use global settings."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185
-msgid "Customize line drawing"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
-msgid "Use global settings."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
 msgid "Draw lines between points for this layer."
 msgstr "Riši povezave med točkami na tej plasti."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
 msgid "Do not draw lines between points for this layer."
 msgstr "Ne riši povezav med točkami na tej plasti."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
 msgid "Select line drawing options"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:214
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194
 msgid "Customize Color"
 msgstr "Prilagodi barvo"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:336
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334
 msgid "OK"
 msgstr "V redu"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -3815 +4390 @@
 msgstr "Privzeto"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:155
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
 #: ../plugins/grid/src/grid/GridLayer.java:163
@@ -3822 +4397 @@
 msgstr "Izberite barvo"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:171
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
 msgid "Markers From Named Points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:182
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184
 msgid "Import Audio"
 msgstr "Uvozi zvok"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:202
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197
 msgid "Wave Audio files (*.wav)"
 msgstr "Zvočne datoteke (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:210
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:205
 #, java-format
 msgid "Audio markers from {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:232
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
 msgid "Import images"
 msgstr "Uvozi slike"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:302
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297
 #, java-format
 msgid "{0} track, "
@@ -3855 +4430 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:303
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:298
 #, java-format
 msgid "{0} route, "
@@ -3862 +4437 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:299
 #, java-format
 msgid "{0} waypoint"
@@ -3869 +4444 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:308
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:303
 #, java-format
 msgid "Name: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:311
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:306
 #, java-format
 msgid "Description: {0}"
 msgstr "Opis: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330
 msgid "Timespan: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:342
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337
 msgid "Length: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:658
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:656
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
 msgid "Convert to data layer"
 msgstr "Pretvori v podatkovno plast"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:662
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:660
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
 msgid ""
@@ -3899 +4474 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:663
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:661
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:464
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:681
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:466
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
@@ -3913 +4488 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:696
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:808
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:697
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:718
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809
 msgid "Download from OSM along this track"
 msgstr "Sprejmi iz OSM vzdolž te sledi"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:704
 msgid "Download everything within:"
 msgstr "Sprejmi vse znotraj:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:707
 #, java-format
 msgid "{0} meters"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:709
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:710
 msgid "Maximum area per request:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:713
 #, java-format
 msgid "{0} sq km"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:804
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805
 #, java-format
 msgid ""
@@ -3946 +4521 @@
 "nadaljevati?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:878
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:879
 msgid "No GPX track available in layer to associate audio with."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1025
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1026
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -3956 +4531 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1029
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1030
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -3971 +4546 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:362
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:364
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} je sestavljen iz:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:366
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368
 #, java-format
 msgid " ({0} deleted.)"
 msgstr " ({0} izbrisan.)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:371
 msgid "unset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:371
 #, java-format
 msgid "API version: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:461
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:463
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
 msgid "Convert to GPX layer"
@@ -4028 +4603 @@
 msgstr[3] "točke"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178
 #, java-format
 msgid "a track with {0} point"
@@ -4037 +4612 @@
 msgstr[3] "sled z {0} točkami"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
 #, java-format
 msgid "{0} consists of {1} track"
@@ -4044 +4619 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
 #, java-format
 msgid "{0} point"
@@ -4177 +4752 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:93
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92
 msgid "Please select the row to delete."
 msgstr "Prosim izberite vrstico za izbris."
@@ -5511 +6086 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:85
 msgid "Update"
 msgstr "Posodobi"
@@ -5521 +6096 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:72
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
-msgid "Add either site-josm.xml or Wiki Pages."
+msgid "Add JOSM Plugin description URL."
 msgstr ""
 
@@ -5528 +6102 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:99
 msgid "Please select an entry."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
+msgid "Edit JOSM Plugin description URL."
 msgstr ""
 
@@ -5886 +6464 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:565
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67
@@ -5895 +6473 @@
 msgstr "Vira prednastavitev ni bilo mogoče prebrati: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:566
 #, java-format
 msgid "Error parsing {0}: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:611
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:609
 #: ../plugins/terracer/src/terracer/TerracerAction.java:108
 #, java-format
@@ -5915 +6493 @@
 msgstr[3] "Spremeni {0} predmete"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:614
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612
 #: ../plugins/terracer/src/terracer/TerracerAction.java:110
 msgid "Nothing selected!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:614
 msgid "Selection unsuitable!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:623
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621
 msgid "Apply Preset"
 msgstr "Uporabi prednastavitev"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:689
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:687
 msgid "Change Properties"
 msgstr "Spremeni lastnosti"
@@ -5964 +6542 @@
 msgstr "Pripravljam podatke..."
 
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:21
+msgid "GPX Files"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:48
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33
+#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125
+#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:86
+#, java-format
+msgid "Markers from {0}"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/io/GpxReader.java:309
 msgid "Parse error: invalid document structure for gpx document"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21
+msgid "NMEA-0183 Files"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43
+msgid "Coordinates imported: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43
+msgid "Malformed sentences: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44
+msgid "Checksum errors: "
+msgstr ""
+
+#. don't scare the user unneccessarily
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:46
+msgid "Unknown sentences: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47
+msgid "Zero coordinates: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49
+msgid "NMEA import success"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:51
+msgid "NMEA import faliure!"
 msgstr ""
 
@@ -6022 +6645 @@
 msgid "Unknown host"
 msgstr "Neznan gostitelj"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18
+msgid "OSM Server Files bzip2 compressed"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:27
+#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:31
+msgid "Invalid bz2 file."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:80
@@ -6048 +6680 @@
 msgstr "Prekinjanje ..."
 
+#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17
+msgid "OSM Server Files gzip compressed"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/io/OsmIdReader.java:38
 msgid "Error during parse."
 msgstr "Napaka med razčlenjevanjem."
 
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:24
+msgid "OSM Server Files"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:158
 msgid "Unknown version"
@@ -6139 +6779 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:51
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:79
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:77
 #, java-format
 msgid ""
@@ -6159 +6799 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:129
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:127
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:41
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87
 msgid "Update Plugins"
 msgstr "Posodobitev vstavkov"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:51
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:129
+msgid "Download Plugins"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:59
 #, java-format
 msgid ""
@@ -6180 +6825 @@
 " {0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:53
-#, java-format
-msgid "{0} Plugin successfully updated. Please restart JOSM."
-msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
-msgstr[0] "{0} vsavkov uspešno posodobljenih. Ponovno zaženite JOSM."
-msgstr[1] "{0} vsavek uspešno posodobljen. Ponovno zaženite JOSM."
-msgstr[2] "{0} vsavka uspešno posodobljena. Ponovno zaženite JOSM."
-msgstr[3] "{0} vsavki uspešno posodobljeni. Ponovno zaženite JOSM."
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:110
-#, java-format
-msgid "Could not download plugin: {0} from {1}"
-msgstr "Sprejem vstavka {0} z naslova {1} ni bil mogoč"
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:61
+#, java-format
+msgid "{0} Plugin successfully downloaded. Please restart JOSM."
+msgid_plural "{0} Plugins successfully downloaded. Please restart JOSM."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69
+#, java-format
+msgid "Downloading Plugin {0}..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117
-#, java-format
-msgid ""
-"The plugin {0} seems to be broken or could not be downloaded automatically."
-msgstr ""
-"Vstavek {0} izgleda pokvarjen, ali pa ga ni bilo mogoče samodejno sprejeti."
+msgid "Skip download"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118
+#, java-format
+msgid "JOSM version {0} required for plugin {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119
+msgid "Download Plugin"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119
+msgid "Skip Download"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginException.java:18
@@ -6213 +6866 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:86
-#, java-format
-msgid "Plugin requires JOSM update: {0}."
-msgstr "Vstavek zahteva posodobitev programa JOSM: {0}."
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:79
+#, java-format
+msgid "Plugin {0} requires JOSM update to version {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:94
 #, java-format
 msgid "Plugin {0} is required by plugin {1} but was not found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:110
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:103
 #, java-format
 msgid "Plugin not found: {0}."
 msgstr "Vstavka {0} ni bilo mogoče najti."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:117
 #, java-format
 msgid "Last plugin update more than {0} days ago."
 msgstr "Zadnja posodobitev vstavkov pred več kot {0} dnevi."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:126
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:119
 msgid ""
 "(You can change the number of days after which this warning appears<br>by "
@@ -6241 +6894 @@
 "možnosti 'pluginmanager.warntime' v nastavitvah.)"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:154
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:247
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257
 msgid "Disable plugin"
 msgstr "Onemogoči vstavek"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:155
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:148
 #, java-format
 msgid "Could not load plugin {0}. Delete from preferences?"
 msgstr "Vstavka {0} ni bilo mogoče naložiti. Ga izbrišem iz nastavitev?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149
 msgid "Keep plugin"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:198
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:191
 msgid ""
 "Activating the updated plugins failed. Check if JOSM has the permission to "
@@ -6265 +6918 @@
 "prepisati obstoječe datoteke."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:248
 #, java-format
 msgid ""
@@ -6272 +6925 @@
 "Prišlo je do nepričakovane napake, ki verjetno izvira iz vstavka ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:258
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:251
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "Glede na podatke znotraj vstavka je avtor {0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:261
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
@@ -6283 +6936 @@
 "Preden prijavite napako poskusite posodobiti vstavek na najnovejšo različico."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:263
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:256
 msgid "Should the plugin be disabled?"
 msgstr "Naj vstavek onemogočim?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:277
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:270
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -6295 +6948 @@
 "njegovo odstranitev iz spomina."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:280
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:273
 msgid ""
 "The plugin could not be removed. Please tell the people you got JOSM from "
@@ -6303 +6956 @@
 "dobili JOSM."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:305
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:298
 #: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37
 msgid "Information"
 msgstr "Informacije"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:143
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:134
 msgid "no description available"
 msgstr "opis ni na voljo"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:145
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:136
 msgid "More details"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:54
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -6326 +6979 @@
 msgstr[3] "Sprejeti podatki o vstavkih z  {0} strežnikov"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:57
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:58
 msgid "No plugin information found."
 msgstr "Informacij o vsavku ni bilo mogoče najti."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:78
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
 msgid "All installed plugins are up to date."
 msgstr "Vsi nameščeni vstavki so posodobljeni."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:86
 #, java-format
 msgid ""
@@ -6345 +6998 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:127
 msgid "Download missing plugins"
 msgstr "Sprejem manjkajočih vstavkov"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:108
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:128
 #, java-format
 msgid ""
@@ -6360 +7013 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109
-msgid "Download Plugins"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:163
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:171
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:180
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:189
 #: build/trans_presets.java:312 build/trans_presets.java:313
 #: build/trans_presets.java:314 build/trans_presets.java:315
@@ -6386 +7035 @@
 msgstr "neznan"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:177
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:194
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr "{0}: Različica {1}{2}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:185
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:202
 msgid "Plugin bundled with JOSM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:217
-msgid "Plugin already exists"
-msgstr "Vstavek že obstaja"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:218
-#, java-format
-msgid ""
-"Plugin archive already available. Do you want to download the current "
-"version by deleting existing archive?\n"
-"\n"
-"{0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:221
-msgid "Delete and Download"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:226
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:231
-#, java-format
-msgid "Error deleting plugin file: {0}"
-msgstr "Napaka pri brisanju datoteke vstavka: {0}"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:337
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:346
 #, java-format
 msgid "Error reading plugin information file: {0}"
@@ -6558 +7184 @@
 msgstr ""
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:229
-msgid "Tags"
-msgstr "Oznake"
-
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:109
 msgid "Please enter tags about your trace."
@@ -6728 +7349 @@
 msgid "File {0} is loaded yet under the name \"{1}\""
 msgstr ""
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:170
+#, java-format
+msgid "Error while parsing {0}"
+msgstr "Napaka pri razčlenjevanju {0}"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:210
@@ -6947 +7573 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:337
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:354
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:339
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357
 msgid "Error loading file"
 msgstr ""
@@ -7263 +7889 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:81
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:80
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:66
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:169
 msgid "Blank Layer"
 msgstr "Prazna plast"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:182
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181
 #, java-format
 msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr ""
 
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:183
+msgid "Is not vectorized."
+msgstr ""
+
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184
-msgid "Is not vectorized."
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:185
 #, java-format
 msgid "Raster center: {0}"
 msgstr ""
 
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186
+msgid "Is vectorized."
+msgstr ""
+
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187
-msgid "Is vectorized."
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:188
 #, java-format
 msgid "Commune bbox: {0}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:283
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:282
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:293
 msgid "Save WMS layer to file"
 msgstr "Shrani plast WMS v datoteko"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:287
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:297
+msgid "Save WMS layer"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:309
@@ -7302 +7933 @@
 msgstr "Naloži plast WMS iz datoteke"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:322
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:333
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:314
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:325
+msgid "Load WMS layer"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:324
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "Nepodprta različica datoteke WMS; našel {0}, pričakoval {1}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:323
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:334
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:325
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337
 msgid "File Format Error"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:526
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:481
 #, java-format
 msgid ""
@@ -7320 +7956 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:527
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:482
 msgid "Cache Format Error"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:542
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:497
 #, java-format
 msgid "Lambert zone {0} in cache  incompatible with current Lambert zone {1}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:544
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:499
 msgid "Cache Lambert Zone Error"
 msgstr ""
@@ -7368 +8004 @@
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:37
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41
-#, fuzzy
 msgid "Split area"
-msgstr "Potok"
+msgstr ""
 
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:39
@@ -7799 +8434 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_style.java:946 build/trans_style.java:963
-#: build/trans_style.java:979 build/trans_style.java:3334
-#: build/trans_style.java:3342
+#: build/trans_style.java:947 build/trans_style.java:964
+#: build/trans_style.java:980 build/trans_style.java:3333
+#: build/trans_style.java:3341
 msgid "water"
 msgstr ""
@@ -8177 +8812 @@
 msgstr ""
 
-#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:44
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46
+#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48
 msgid "Open Visible..."
 msgstr "Odpri vidne ..."
 
-#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:45
+#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47
 msgid "Open only files that are visible in current view."
 msgstr "Odpri le datoteke, ki so vidne v trenutnem pogledu."
 
-#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:55
+#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:57
 msgid "No view open - cannot determine boundaries!"
 msgstr ""
+
+#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:110
+#, java-format
+msgid "Unknown file extension: {0}"
+msgstr "Neznana končnica datoteke: {0}"
 
 #: ../plugins/osmarender/src/OsmarenderPlugin.java:41
@@ -8273 +8913 @@
 #. TODO Use constructor with shortcut
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:139
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:164
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:163
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:87
@@ -8298 +8938 @@
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:76
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:77
 msgid "Add routing layer"
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:87
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:88
 msgid "Criteria"
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:89
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:90
 msgid "Shortest"
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:112
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:113
 msgid "Fastest"
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:138
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:139
 msgid "Reverse route"
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:151
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:152
 msgid "Clear route"
 msgstr ""
@@ -8489 +9129 @@
 msgstr ""
 
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:59
+msgid "Edit tags"
+msgstr ""
+
+#. TODO: set "tag-editor" and add /images/tag-editor.png to distrib
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:61
-msgid "Edit tags"
-msgstr ""
-
-#. TODO: set "tag-editor" and add /images/tag-editor.png to distrib
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:63
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:66
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:64
 msgid "Launches the tag editor dialog"
 msgstr ""
@@ -8503 +9143 @@
 msgstr ""
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:29
-msgid "(none)"
-msgstr ""
-
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:53
 msgid "Highlight"
@@ -8515 +9151 @@
 msgstr ""
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:353
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342
 #, java-format
 msgid "Remove old keys from up to {0} object"
@@ -8522 +9158 @@
 msgstr[1] ""
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:383
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371
 #, java-format
 msgid "Updating properties of up to {0} object"
@@ -8542 +9178 @@
 msgstr ""
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:64
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:62
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:63
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:61
 msgid "Clear"
+msgstr ""
+
+#. should not happen
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableModel.java:83
+#, java-format
+msgid "unexpected column number {0}"
 msgstr ""
 
@@ -9430 +10072 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4069 build/trans_style.java:4076
-#: build/trans_style.java:4083 build/trans_style.java:4090
-#: build/trans_style.java:4097
+#: build/trans_style.java:4068 build/trans_style.java:4075
+#: build/trans_style.java:4082 build/trans_style.java:4089
+#: build/trans_style.java:4096
 msgid "building"
 msgstr "zgradba"
@@ -9444 +10086 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4104
+#: build/trans_style.java:4103
 msgid "area"
 msgstr ""
@@ -9532 +10174 @@
 #, java-format
 msgid "{0}, ..."
+msgstr ""
+
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:67
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:73
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:80
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:92
+msgid "Select a starting node on the end of a way"
+msgstr ""
+
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:149
+msgid "Reached the end of the line"
+msgstr ""
+
+#. Three or more ways meeting at this node. Means we have a junction.
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:156
+msgid "Reached a junction"
 msgstr ""
 
@@ -9606 +10264 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:58
 msgid "Automatic downloading"
 msgstr "Samodejno sprejemanje"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:117
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:116
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:118
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:171
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:170
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:231
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:230
 msgid "Download visible tiles"
 msgstr "Naloži vidne ploščice"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:240
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239
 msgid "Change resolution"
 msgstr "Spremeni ločljivost"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:252
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251
 msgid "Reload erroneous tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:274
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:273
 msgid "Alpha channel"
 msgstr ""
@@ -9649 +10307 @@
 msgstr "Odpri prazno plast WMS za nalaganje podatkov iz datoteke"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
 msgid "WMS Plugin Preferences"
 msgstr "Nastavitve WMS vstavka"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
 msgid "Modify list of WMS servers displayed in the WMS plugin menu"
 msgstr "Spremeni seznam strežnikov WMS, ki so prikazani v meniju WMS vstavka"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74
 msgid "Menu Name"
 msgstr "Naziv v meniju"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:79
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78
 msgid "WMS URL"
 msgstr "Povezava do WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:56
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55
 msgid "Menu Name (Default)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:56
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55
 msgid "WMS URL (Default)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80
 msgid "Enter a menu name and WMS URL"
 msgstr "Vpišite ime za meni in povezavo do WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:103
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
 msgid "Copy Default"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:109
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:108
 msgid "Please select the row to copy."
 msgstr ""
 
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120
+msgid "Overlap tiles"
+msgstr ""
+
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
-msgid "Overlap tiles"
+msgid "% of lat:"
 msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122
-msgid "% of lat:"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:123
 msgid "% of lon:"
 msgstr ""
@@ -9779 +10437 @@
 #: build/trans_plugins.java:17
 msgid ""
-"The main feature of the plugin is the possibility to delete points of the "
-"GPX track. This plugin can be used to prepare  tracks for uploading to OSM "
-"eg. deleting uninteresting parts of track."
+"Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
+"very fast."
 msgstr ""
 
@@ -9929 +10586 @@
 msgstr ""
 
+#. Plugin waydownloader
+#: build/trans_plugins.java:67
+msgid "Easy downloading along a long set of interconnected ways"
+msgstr ""
+
 #. Plugin wmsplugin
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:69
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -10746 +11408 @@
 #: build/trans_presets.java:601 build/trans_presets.java:602
 #: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:185
+#: build/trans_presets.java:623 build/trans_style.java:188
 msgid "private"
 msgstr ""
@@ -10792 +11454 @@
 #: build/trans_presets.java:601 build/trans_presets.java:602
 #: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:192
+#: build/trans_presets.java:623 build/trans_style.java:195
 msgid "destination"
 msgstr ""
@@ -10827 +11489 @@
 #: build/trans_presets.java:601 build/trans_presets.java:602
 #: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:178
+#: build/trans_presets.java:623 build/trans_style.java:181
 msgid "permissive"
 msgstr ""
@@ -11057 +11719 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:509
-#: build/trans_style.java:517
+#: build/trans_presets.java:338 build/trans_style.java:512
+#: build/trans_style.java:520
 msgid "motorway"
 msgstr ""
@@ -11082 +11744 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:525
-#: build/trans_style.java:533
+#: build/trans_presets.java:338 build/trans_style.java:528
+#: build/trans_style.java:536
 msgid "trunk"
 msgstr "hitra cesta"
@@ -11107 +11769 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:541
-#: build/trans_style.java:549
+#: build/trans_presets.java:338 build/trans_style.java:544
+#: build/trans_style.java:552
 msgid "primary"
 msgstr "glavna"
@@ -11132 +11794 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:557
-#: build/trans_style.java:565
+#: build/trans_presets.java:338 build/trans_style.java:560
+#: build/trans_style.java:568
 msgid "secondary"
 msgstr "regionalna"
@@ -11145 +11807 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:338 build/trans_style.java:573
+#: build/trans_presets.java:338 build/trans_style.java:576
 msgid "tertiary"
 msgstr "regionalna (turistična)"
@@ -11161 +11823 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:338 build/trans_style.java:3085
+#: build/trans_presets.java:338 build/trans_style.java:3084
 msgid "residential"
 msgstr ""
@@ -11177 +11839 @@
 #. <rule>
 #. <condition k="highway" v="service"/>
-#: build/trans_presets.java:338 build/trans_style.java:629
+#: build/trans_presets.java:338 build/trans_style.java:632
 msgid "service"
 msgstr ""
@@ -11202 +11864 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:338 build/trans_style.java:833
-#: build/trans_style.java:3150 build/trans_style.java:3151
+#: build/trans_presets.java:338 build/trans_style.java:834
+#: build/trans_style.java:3149 build/trans_style.java:3150
 msgid "construction"
 msgstr ""
@@ -11251 +11913 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:400 build/trans_style.java:851
+#: build/trans_presets.java:400 build/trans_style.java:852
 msgid "roundabout"
 msgstr "krožišče"
@@ -12228 +12890 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1111 build/trans_style.java:3326
+#: build/trans_presets.java:1111 build/trans_style.java:3325
 msgid "marsh"
 msgstr ""
@@ -13950 +14612 @@
 #: build/trans_presets.java:1791 build/trans_presets.java:1800
 #: build/trans_presets.java:1809 build/trans_presets.java:1818
-#: build/trans_style.java:3506 build/trans_style.java:3514
-#: build/trans_style.java:3522 build/trans_style.java:3530
-#: build/trans_style.java:3538 build/trans_style.java:3546
-#: build/trans_style.java:3554 build/trans_style.java:3562
-#: build/trans_style.java:3570 build/trans_style.java:3578
-#: build/trans_style.java:3586 build/trans_style.java:3594
-#: build/trans_style.java:3602 build/trans_style.java:3610
-#: build/trans_style.java:3618 build/trans_style.java:3626
-#: build/trans_style.java:3634 build/trans_style.java:3642
-#: build/trans_style.java:3650 build/trans_style.java:3658
-#: build/trans_style.java:3666 build/trans_style.java:3674
-#: build/trans_style.java:3682 build/trans_style.java:3690
-#: build/trans_style.java:3698 build/trans_style.java:3706
-#: build/trans_style.java:3714 build/trans_style.java:3722
-#: build/trans_style.java:3730 build/trans_style.java:3738
-#: build/trans_style.java:3746 build/trans_style.java:3754
-#: build/trans_style.java:3762 build/trans_style.java:3770
-#: build/trans_style.java:3778 build/trans_style.java:3786
-#: build/trans_style.java:3794 build/trans_style.java:3802
-#: build/trans_style.java:3810 build/trans_style.java:3818
-#: build/trans_style.java:3826 build/trans_style.java:3834
-#: build/trans_style.java:3842 build/trans_style.java:3850
-#: build/trans_style.java:3858
+#: build/trans_style.java:3505 build/trans_style.java:3513
+#: build/trans_style.java:3521 build/trans_style.java:3529
+#: build/trans_style.java:3537 build/trans_style.java:3545
+#: build/trans_style.java:3553 build/trans_style.java:3561
+#: build/trans_style.java:3569 build/trans_style.java:3577
+#: build/trans_style.java:3585 build/trans_style.java:3593
+#: build/trans_style.java:3601 build/trans_style.java:3609
+#: build/trans_style.java:3617 build/trans_style.java:3625
+#: build/trans_style.java:3633 build/trans_style.java:3641
+#: build/trans_style.java:3649 build/trans_style.java:3657
+#: build/trans_style.java:3665 build/trans_style.java:3673
+#: build/trans_style.java:3681 build/trans_style.java:3689
+#: build/trans_style.java:3697 build/trans_style.java:3705
+#: build/trans_style.java:3713 build/trans_style.java:3721
+#: build/trans_style.java:3729 build/trans_style.java:3737
+#: build/trans_style.java:3745 build/trans_style.java:3753
+#: build/trans_style.java:3761 build/trans_style.java:3769
+#: build/trans_style.java:3777 build/trans_style.java:3785
+#: build/trans_style.java:3793 build/trans_style.java:3801
+#: build/trans_style.java:3809 build/trans_style.java:3817
+#: build/trans_style.java:3825 build/trans_style.java:3833
+#: build/trans_style.java:3841 build/trans_style.java:3849
+#: build/trans_style.java:3857
 msgid "sport"
 msgstr "šport"
@@ -16808 +17470 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:2993 build/trans_style.java:206
-#: build/trans_style.java:645 build/trans_style.java:862
-#: build/trans_style.java:870 build/trans_style.java:878
-#: build/trans_style.java:886 build/trans_style.java:894
+#: build/trans_presets.java:2993 build/trans_style.java:209
+#: build/trans_style.java:648 build/trans_style.java:863
+#: build/trans_style.java:871 build/trans_style.java:879
+#: build/trans_style.java:887 build/trans_style.java:895
 msgid "bicycle"
 msgstr ""
@@ -16870 +17532 @@
 #. <condition k="highway" v="pedestrian"/>
 #. color foot
-#. <!-- seems to be common to use area=yes for areas here -->
-#. <!-- some people seem to have problems that polylines displayed as areas, so comment this out -->
 #. color foot
 #. <icon annotate="true" src="misc/deprecated.png"/>
@@ -16880 +17540 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:2993 build/trans_style.java:220
-#: build/trans_style.java:653 build/trans_style.java:661
-#: build/trans_style.java:669 build/trans_style.java:672
-#: build/trans_style.java:680
+#: build/trans_presets.java:2993 build/trans_style.java:223
+#: build/trans_style.java:656 build/trans_style.java:664
+#: build/trans_style.java:672 build/trans_style.java:673
+#: build/trans_style.java:681
 msgid "foot"
 msgstr ""
@@ -16907 +17567 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:2993 build/trans_style.java:1162
+#: build/trans_presets.java:2993 build/trans_style.java:1163
 msgid "subway"
 msgstr ""
@@ -16990 +17650 @@
 #. - priority
 #. - dashed x - dashed line, length of dashes / spaces in x pixels
+#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels
 #. - dashedcolour second (background) colour of a dashed line
 #. 4. linemod attributes
@@ -17002 +17663 @@
 #. - colour
 #. - priority
+#. - closed (true or false - when true the area style is ignored for unclosed ways)
 #. 6. icon attributes
 #. - icon path to icon, relative to the icon path (default: subdirectory icons in
 #. directory where this file is)
 #. - priority
+#. - annonate (true or false)
 #. 7. scale_min / scale_max
 #. - zoom scale for display
@@ -17023 +17686 @@
 #. -->
 #.
-#: build/trans_style.java:49
+#: build/trans_style.java:52
 msgid "standard"
 msgstr ""
@@ -17111 +17774 @@
 #. <rule>
 #. <condition k="tunnel" b="yes"/>
-#: build/trans_style.java:105 build/trans_style.java:119
-#: build/trans_style.java:126 build/trans_style.java:133
-#: build/trans_style.java:140
+#: build/trans_style.java:108 build/trans_style.java:122
+#: build/trans_style.java:129 build/trans_style.java:136
+#: build/trans_style.java:143
 msgid "bridge"
 msgstr ""
@@ -17375 +18038 @@
 #. <rule>
 #. <condition k="leisure" v="zoo"/>
-#: build/trans_style.java:112 build/trans_style.java:147
-#: build/trans_style.java:154 build/trans_style.java:161
-#: build/trans_style.java:589 build/trans_style.java:787
-#: build/trans_style.java:1112 build/trans_style.java:2365
-#: build/trans_style.java:3317 build/trans_style.java:3318
-#: build/trans_style.java:3872 build/trans_style.java:4156
-#: build/trans_style.java:4165 build/trans_style.java:4174
-#: build/trans_style.java:4183 build/trans_style.java:4192
-#: build/trans_style.java:4201 build/trans_style.java:4210
-#: build/trans_style.java:4211 build/trans_style.java:4220
-#: build/trans_style.java:4229
+#: build/trans_style.java:115 build/trans_style.java:150
+#: build/trans_style.java:157 build/trans_style.java:164
+#: build/trans_style.java:592 build/trans_style.java:788
+#: build/trans_style.java:1113 build/trans_style.java:2364
+#: build/trans_style.java:3316 build/trans_style.java:3317
+#: build/trans_style.java:3871 build/trans_style.java:4155
+#: build/trans_style.java:4164 build/trans_style.java:4173
+#: build/trans_style.java:4182 build/trans_style.java:4191
+#: build/trans_style.java:4200 build/trans_style.java:4209
+#: build/trans_style.java:4210 build/trans_style.java:4219
+#: build/trans_style.java:4228
 msgid "deprecated"
 msgstr ""
@@ -17425 +18088 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:248 build/trans_style.java:637
+#: build/trans_style.java:251 build/trans_style.java:640
 msgid "horse"
 msgstr ""
@@ -17633 +18296 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#: build/trans_style.java:355 build/trans_style.java:368
-#: build/trans_style.java:369 build/trans_style.java:382
-#: build/trans_style.java:383 build/trans_style.java:402
-#: build/trans_style.java:403 build/trans_style.java:410
-#: build/trans_style.java:423 build/trans_style.java:424
-#: build/trans_style.java:437 build/trans_style.java:438
-#: build/trans_style.java:451 build/trans_style.java:452
+#: build/trans_style.java:358 build/trans_style.java:371
+#: build/trans_style.java:372 build/trans_style.java:385
+#: build/trans_style.java:386 build/trans_style.java:405
+#: build/trans_style.java:406 build/trans_style.java:413
+#: build/trans_style.java:426 build/trans_style.java:427
+#: build/trans_style.java:440 build/trans_style.java:441
+#: build/trans_style.java:454 build/trans_style.java:455
 msgid "barrier"
 msgstr ""
@@ -17675 +18338 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_style.java:581 build/trans_style.java:597
-#: build/trans_style.java:613 build/trans_style.java:621
+#: build/trans_style.java:584 build/trans_style.java:600
+#: build/trans_style.java:616 build/trans_style.java:624
 msgid "street"
 msgstr ""
@@ -17730 +18393 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:605 build/trans_style.java:904
-#: build/trans_style.java:912 build/trans_style.java:920
-#: build/trans_style.java:928 build/trans_style.java:936
+#: build/trans_style.java:608 build/trans_style.java:905
+#: build/trans_style.java:913 build/trans_style.java:921
+#: build/trans_style.java:929 build/trans_style.java:937
 msgid "highway_track"
 msgstr ""
@@ -17786 +18449 @@
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. color rail
-#: build/trans_style.java:688 build/trans_style.java:1136
-#: build/trans_style.java:1194 build/trans_style.java:1202
-#: build/trans_style.java:1211 build/trans_style.java:1219
-#: build/trans_style.java:1220
+#: build/trans_style.java:689 build/trans_style.java:1137
+#: build/trans_style.java:1195 build/trans_style.java:1203
+#: build/trans_style.java:1212 build/trans_style.java:1220
+#: build/trans_style.java:1221
 msgid "rail"
 msgstr ""
@@ -17808 +18471 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:802
+#: build/trans_style.java:803
 msgid "services"
 msgstr ""
@@ -17820 +18483 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:810
+#: build/trans_style.java:811
 msgid "ford"
 msgstr ""
@@ -17839 +18502 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:825
+#: build/trans_style.java:826
 msgid "turningcircle"
 msgstr ""
@@ -17852 +18515 @@
 #. <condition k="highway" v="emergency_access_point"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:842
+#: build/trans_style.java:843
 msgid "emergency_access_point"
 msgstr ""
@@ -17865 +18528 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:954 build/trans_style.java:955
+#: build/trans_style.java:955 build/trans_style.java:956
 msgid "riverbank"
 msgstr ""
@@ -17877 +18540 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:971
+#: build/trans_style.java:972
 msgid "stream"
 msgstr ""
@@ -17889 +18552 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:987
+#: build/trans_style.java:988
 msgid "dock"
 msgstr ""
@@ -17915 +18578 @@
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
-#: build/trans_style.java:1009
+#: build/trans_style.java:1010
 msgid "aqueduct"
 msgstr ""
@@ -18081 +18744 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1018 build/trans_style.java:1047
-#: build/trans_style.java:1055 build/trans_style.java:1056
-#: build/trans_style.java:1064 build/trans_style.java:1498
-#: build/trans_style.java:1505 build/trans_style.java:1514
-#: build/trans_style.java:1522 build/trans_style.java:1549
-#: build/trans_style.java:1557 build/trans_style.java:1565
-#: build/trans_style.java:1573 build/trans_style.java:1580
-#: build/trans_style.java:1589 build/trans_style.java:1597
-#: build/trans_style.java:1605 build/trans_style.java:1613
+#: build/trans_style.java:1019 build/trans_style.java:1048
+#: build/trans_style.java:1056 build/trans_style.java:1057
+#: build/trans_style.java:1065 build/trans_style.java:1499
+#: build/trans_style.java:1506 build/trans_style.java:1515
+#: build/trans_style.java:1523 build/trans_style.java:1548
+#: build/trans_style.java:1556 build/trans_style.java:1564
+#: build/trans_style.java:1572 build/trans_style.java:1579
+#: build/trans_style.java:1588 build/trans_style.java:1596
+#: build/trans_style.java:1604 build/trans_style.java:1612
 msgid "manmade"
 msgstr ""
@@ -18149 +18812 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1074 build/trans_style.java:1089
-#: build/trans_style.java:1104 build/trans_style.java:1120
-#: build/trans_style.java:1128
+#: build/trans_style.java:1075 build/trans_style.java:1090
+#: build/trans_style.java:1105 build/trans_style.java:1121
+#: build/trans_style.java:1129
 msgid "railwaypoint"
 msgstr ""
@@ -18172 +18835 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1145 build/trans_style.java:1154
+#: build/trans_style.java:1146 build/trans_style.java:1155
 msgid "otherrail"
 msgstr ""
 
 #. color otherrail
-#: build/trans_style.java:1146
+#: build/trans_style.java:1147
 msgid "railover"
 msgstr ""
@@ -18205 +18868 @@
 #. <rule>
 #. <condition k="railway" v="abandoned"/>
-#: build/trans_style.java:1170 build/trans_style.java:1178
-#: build/trans_style.java:1186
+#: build/trans_style.java:1171 build/trans_style.java:1179
+#: build/trans_style.java:1187
 msgid "oldrail"
 msgstr ""
@@ -18249 +18912 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1250 build/trans_style.java:1251
-#: build/trans_style.java:1283
+#: build/trans_style.java:1251 build/trans_style.java:1252
+#: build/trans_style.java:1284
 msgid "aeroway"
 msgstr ""
@@ -18262 +18925 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1259
+#: build/trans_style.java:1260
 msgid "terminal"
 msgstr ""
@@ -18282 +18945 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1267 build/trans_style.java:1275
+#: build/trans_style.java:1268 build/trans_style.java:1276
 msgid "aeroway_dark"
 msgstr ""
@@ -18294 +18957 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1291
+#: build/trans_style.java:1292
 msgid "aeroway_light"
 msgstr ""
@@ -18340 +19003 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1301 build/trans_style.java:1309
-#: build/trans_style.java:1317 build/trans_style.java:1325
-#: build/trans_style.java:1333
+#: build/trans_style.java:1302 build/trans_style.java:1310
+#: build/trans_style.java:1318 build/trans_style.java:1326
+#: build/trans_style.java:1334
 msgid "aerialway"
 msgstr ""
@@ -18357 +19020 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1343 build/trans_style.java:1344
+#: build/trans_style.java:1344 build/trans_style.java:1345
 msgid "piste_easy"
 msgstr ""
@@ -18370 +19033 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1352 build/trans_style.java:1353
+#: build/trans_style.java:1353 build/trans_style.java:1354
 msgid "piste_intermediate"
 msgstr ""
@@ -18383 +19046 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1361 build/trans_style.java:1362
+#: build/trans_style.java:1362 build/trans_style.java:1363
 msgid "piste_advanced"
 msgstr ""
@@ -18396 +19059 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1370 build/trans_style.java:1371
+#: build/trans_style.java:1371 build/trans_style.java:1372
 msgid "piste_expert"
 msgstr ""
@@ -18409 +19072 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1379 build/trans_style.java:1380
+#: build/trans_style.java:1380 build/trans_style.java:1381
 msgid "piste_freeride"
 msgstr ""
@@ -18422 +19085 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1388 build/trans_style.java:1389
+#: build/trans_style.java:1389 build/trans_style.java:1390
 msgid "piste_novice"
 msgstr ""
@@ -18525 +19188 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1400 build/trans_style.java:1407
-#: build/trans_style.java:1416 build/trans_style.java:1424
-#: build/trans_style.java:1432 build/trans_style.java:1440
-#: build/trans_style.java:1448 build/trans_style.java:1456
-#: build/trans_style.java:1464 build/trans_style.java:1472
-#: build/trans_style.java:1480 build/trans_style.java:1488
+#: build/trans_style.java:1401 build/trans_style.java:1408
+#: build/trans_style.java:1417 build/trans_style.java:1425
+#: build/trans_style.java:1433 build/trans_style.java:1441
+#: build/trans_style.java:1449 build/trans_style.java:1457
+#: build/trans_style.java:1465 build/trans_style.java:1473
+#: build/trans_style.java:1481 build/trans_style.java:1489
 msgid "power"
 msgstr ""
@@ -18541 +19204 @@
 #. <rule>
 #. <condition k="man_made" v="pier"/>
-#. <!-- seems to be common to use area=yes for areas here -->
-#. <!-- some people seem to have problems that polylines displayed as areas, so comment this out -->
 #. color pier
-#: build/trans_style.java:1531 build/trans_style.java:1532
+#: build/trans_style.java:1530 build/trans_style.java:1531
 msgid "pier"
 msgstr ""
@@ -18556 +19217 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1540
+#: build/trans_style.java:1539
 msgid "pipeline"
 msgstr ""
@@ -18682 +19343 @@
 #. <condition k="leisure" v="miniature_golf"/>
 #. <icon annotate="true" src="sport/golf.png"/>
-#: build/trans_style.java:1623 build/trans_style.java:1631
-#: build/trans_style.java:1639 build/trans_style.java:1647
-#: build/trans_style.java:1655 build/trans_style.java:1663
-#: build/trans_style.java:1679 build/trans_style.java:1687
-#: build/trans_style.java:1695 build/trans_style.java:1703
-#: build/trans_style.java:1711 build/trans_style.java:1719
-#: build/trans_style.java:1727 build/trans_style.java:1735
-#: build/trans_style.java:1743
+#: build/trans_style.java:1622 build/trans_style.java:1630
+#: build/trans_style.java:1638 build/trans_style.java:1646
+#: build/trans_style.java:1654 build/trans_style.java:1662
+#: build/trans_style.java:1678 build/trans_style.java:1686
+#: build/trans_style.java:1694 build/trans_style.java:1702
+#: build/trans_style.java:1710 build/trans_style.java:1718
+#: build/trans_style.java:1726 build/trans_style.java:1734
+#: build/trans_style.java:1742
 msgid "leisure"
 msgstr ""
@@ -18701 +19362 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1671
+#: build/trans_style.java:1670
 msgid "marina"
 msgstr ""
@@ -18771 +19432 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1753 build/trans_style.java:1761
-#: build/trans_style.java:1769 build/trans_style.java:1777
-#: build/trans_style.java:1785 build/trans_style.java:1793
-#: build/trans_style.java:1801 build/trans_style.java:1809
+#: build/trans_style.java:1752 build/trans_style.java:1760
+#: build/trans_style.java:1768 build/trans_style.java:1776
+#: build/trans_style.java:1784 build/trans_style.java:1792
+#: build/trans_style.java:1800 build/trans_style.java:1808
 msgid "amenity"
 msgstr ""
@@ -18874 +19535 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1817 build/trans_style.java:1825
-#: build/trans_style.java:1833 build/trans_style.java:1841
-#: build/trans_style.java:1849 build/trans_style.java:1857
-#: build/trans_style.java:1865 build/trans_style.java:1873
-#: build/trans_style.java:1881 build/trans_style.java:1888
-#: build/trans_style.java:1897 build/trans_style.java:1905
+#: build/trans_style.java:1816 build/trans_style.java:1824
+#: build/trans_style.java:1832 build/trans_style.java:1840
+#: build/trans_style.java:1848 build/trans_style.java:1856
+#: build/trans_style.java:1864 build/trans_style.java:1872
+#: build/trans_style.java:1880 build/trans_style.java:1887
+#: build/trans_style.java:1896 build/trans_style.java:1904
 msgid "amenity_traffic"
 msgstr ""
@@ -19263 +19924 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png"/>
-#: build/trans_style.java:1913 build/trans_style.java:1921
-#: build/trans_style.java:1929 build/trans_style.java:1937
-#: build/trans_style.java:1945 build/trans_style.java:1953
-#: build/trans_style.java:1961 build/trans_style.java:1969
-#: build/trans_style.java:2084 build/trans_style.java:2092
-#: build/trans_style.java:2099 build/trans_style.java:2108
-#: build/trans_style.java:2116 build/trans_style.java:2124
-#: build/trans_style.java:2132 build/trans_style.java:2140
-#: build/trans_style.java:2148 build/trans_style.java:2156
-#: build/trans_style.java:2219 build/trans_style.java:2227
-#: build/trans_style.java:2235 build/trans_style.java:2244
-#: build/trans_style.java:2252 build/trans_style.java:2259
-#: build/trans_style.java:2267 build/trans_style.java:2275
-#: build/trans_style.java:2283 build/trans_style.java:2291
-#: build/trans_style.java:2299 build/trans_style.java:2307
-#: build/trans_style.java:2315 build/trans_style.java:2323
-#: build/trans_style.java:2331 build/trans_style.java:2339
-#: build/trans_style.java:2348 build/trans_style.java:2356
+#: build/trans_style.java:1912 build/trans_style.java:1920
+#: build/trans_style.java:1928 build/trans_style.java:1936
+#: build/trans_style.java:1944 build/trans_style.java:1952
+#: build/trans_style.java:1960 build/trans_style.java:1968
+#: build/trans_style.java:2083 build/trans_style.java:2091
+#: build/trans_style.java:2098 build/trans_style.java:2107
+#: build/trans_style.java:2115 build/trans_style.java:2123
+#: build/trans_style.java:2131 build/trans_style.java:2139
+#: build/trans_style.java:2147 build/trans_style.java:2155
+#: build/trans_style.java:2218 build/trans_style.java:2226
+#: build/trans_style.java:2234 build/trans_style.java:2243
+#: build/trans_style.java:2251 build/trans_style.java:2258
+#: build/trans_style.java:2266 build/trans_style.java:2274
+#: build/trans_style.java:2282 build/trans_style.java:2290
+#: build/trans_style.java:2298 build/trans_style.java:2306
+#: build/trans_style.java:2314 build/trans_style.java:2322
+#: build/trans_style.java:2330 build/trans_style.java:2338
+#: build/trans_style.java:2347 build/trans_style.java:2355
 msgid "amenity_light"
 msgstr ""
@@ -19310 +19971 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:1977 build/trans_style.java:1985
-#: build/trans_style.java:3236
+#: build/trans_style.java:1976 build/trans_style.java:1984
+#: build/trans_style.java:3235
 msgid "light_water"
 msgstr ""
@@ -19370 +20031 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2163 build/trans_style.java:2171
-#: build/trans_style.java:2179 build/trans_style.java:2188
-#: build/trans_style.java:2195 build/trans_style.java:2203
-#: build/trans_style.java:2211
+#: build/trans_style.java:2162 build/trans_style.java:2170
+#: build/trans_style.java:2178 build/trans_style.java:2187
+#: build/trans_style.java:2194 build/trans_style.java:2202
+#: build/trans_style.java:2210
 msgid "health"
 msgstr ""
@@ -19724 +20385 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2375 build/trans_style.java:2383
-#: build/trans_style.java:2391 build/trans_style.java:2399
-#: build/trans_style.java:2407 build/trans_style.java:2415
-#: build/trans_style.java:2423 build/trans_style.java:2431
-#: build/trans_style.java:2439 build/trans_style.java:2447
-#: build/trans_style.java:2455 build/trans_style.java:2463
-#: build/trans_style.java:2471 build/trans_style.java:2479
-#: build/trans_style.java:2487 build/trans_style.java:2495
-#: build/trans_style.java:2503 build/trans_style.java:2511
-#: build/trans_style.java:2519 build/trans_style.java:2527
-#: build/trans_style.java:2535 build/trans_style.java:2543
-#: build/trans_style.java:2551 build/trans_style.java:2559
-#: build/trans_style.java:2567 build/trans_style.java:2575
-#: build/trans_style.java:2583 build/trans_style.java:2591
-#: build/trans_style.java:2599 build/trans_style.java:2607
-#: build/trans_style.java:2615 build/trans_style.java:2623
-#: build/trans_style.java:2631 build/trans_style.java:2639
-#: build/trans_style.java:2647 build/trans_style.java:2655
-#: build/trans_style.java:2663 build/trans_style.java:2671
-#: build/trans_style.java:2679 build/trans_style.java:2687
-#: build/trans_style.java:2695 build/trans_style.java:2703
-#: build/trans_style.java:2712
+#: build/trans_style.java:2374 build/trans_style.java:2382
+#: build/trans_style.java:2390 build/trans_style.java:2398
+#: build/trans_style.java:2406 build/trans_style.java:2414
+#: build/trans_style.java:2422 build/trans_style.java:2430
+#: build/trans_style.java:2438 build/trans_style.java:2446
+#: build/trans_style.java:2454 build/trans_style.java:2462
+#: build/trans_style.java:2470 build/trans_style.java:2478
+#: build/trans_style.java:2486 build/trans_style.java:2494
+#: build/trans_style.java:2502 build/trans_style.java:2510
+#: build/trans_style.java:2518 build/trans_style.java:2526
+#: build/trans_style.java:2534 build/trans_style.java:2542
+#: build/trans_style.java:2550 build/trans_style.java:2558
+#: build/trans_style.java:2566 build/trans_style.java:2574
+#: build/trans_style.java:2582 build/trans_style.java:2590
+#: build/trans_style.java:2598 build/trans_style.java:2606
+#: build/trans_style.java:2614 build/trans_style.java:2622
+#: build/trans_style.java:2630 build/trans_style.java:2638
+#: build/trans_style.java:2646 build/trans_style.java:2654
+#: build/trans_style.java:2662 build/trans_style.java:2670
+#: build/trans_style.java:2678 build/trans_style.java:2686
+#: build/trans_style.java:2694 build/trans_style.java:2702
+#: build/trans_style.java:2711
 msgid "shop"
 msgstr ""
@@ -19815 +20476 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2722 build/trans_style.java:2730
-#: build/trans_style.java:2738 build/trans_style.java:2746
-#: build/trans_style.java:2754 build/trans_style.java:2762
-#: build/trans_style.java:2770 build/trans_style.java:2778
+#: build/trans_style.java:2721 build/trans_style.java:2729
+#: build/trans_style.java:2737 build/trans_style.java:2745
+#: build/trans_style.java:2753 build/trans_style.java:2761
+#: build/trans_style.java:2769 build/trans_style.java:2777
 msgid "hotel"
 msgstr ""
@@ -19966 +20627 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2786 build/trans_style.java:2794
-#: build/trans_style.java:2802 build/trans_style.java:2810
-#: build/trans_style.java:2818 build/trans_style.java:2826
-#: build/trans_style.java:2827 build/trans_style.java:2835
-#: build/trans_style.java:2851 build/trans_style.java:2922
+#: build/trans_style.java:2785 build/trans_style.java:2793
+#: build/trans_style.java:2801 build/trans_style.java:2809
+#: build/trans_style.java:2817 build/trans_style.java:2825
+#: build/trans_style.java:2826 build/trans_style.java:2834
+#: build/trans_style.java:2850 build/trans_style.java:2921
 msgid "tourism"
 msgstr ""
@@ -20040 +20701 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
-#: build/trans_style.java:2932 build/trans_style.java:2940
-#: build/trans_style.java:2948 build/trans_style.java:2956
-#: build/trans_style.java:2964 build/trans_style.java:2972
-#: build/trans_style.java:2980 build/trans_style.java:2988
+#: build/trans_style.java:2931 build/trans_style.java:2939
+#: build/trans_style.java:2947 build/trans_style.java:2955
+#: build/trans_style.java:2963 build/trans_style.java:2971
+#: build/trans_style.java:2979 build/trans_style.java:2987
 msgid "historic"
 msgstr ""
@@ -20112 +20773 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_style.java:2997 build/trans_style.java:3005
-#: build/trans_style.java:3013 build/trans_style.java:3021
-#: build/trans_style.java:3069 build/trans_style.java:3077
-#: build/trans_style.java:3175 build/trans_style.java:3183
+#: build/trans_style.java:2996 build/trans_style.java:3004
+#: build/trans_style.java:3012 build/trans_style.java:3020
+#: build/trans_style.java:3068 build/trans_style.java:3076
+#: build/trans_style.java:3174 build/trans_style.java:3182
 msgid "green"
 msgstr ""
@@ -20127 +20788 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3029
+#: build/trans_style.java:3028
 msgid "quarry"
 msgstr ""
@@ -20139 +20800 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3037
+#: build/trans_style.java:3036
 msgid "landfill"
 msgstr ""
@@ -20159 +20820 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3045 build/trans_style.java:3053
+#: build/trans_style.java:3044 build/trans_style.java:3052
 msgid "basin"
 msgstr ""
@@ -20171 +20832 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3061
+#: build/trans_style.java:3060
 msgid "forest"
 msgstr ""
@@ -20183 +20844 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3093
+#: build/trans_style.java:3092
 msgid "farmyard"
 msgstr ""
@@ -20204 +20865 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3102 build/trans_style.java:3110
+#: build/trans_style.java:3101 build/trans_style.java:3109
 msgid "retail"
 msgstr ""
@@ -20216 +20877 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3118
+#: build/trans_style.java:3117
 msgid "industrial"
 msgstr ""
@@ -20228 +20889 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3126
+#: build/trans_style.java:3125
 msgid "brownfield"
 msgstr ""
@@ -20240 +20901 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3134
+#: build/trans_style.java:3133
 msgid "greenfield"
 msgstr ""
@@ -20252 +20913 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3142
+#: build/trans_style.java:3141
 msgid "railland"
 msgstr ""
@@ -20307 +20968 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3159 build/trans_style.java:3194
-#: build/trans_style.java:3202 build/trans_style.java:3210
-#: build/trans_style.java:3218 build/trans_style.java:3226
+#: build/trans_style.java:3158 build/trans_style.java:3193
+#: build/trans_style.java:3201 build/trans_style.java:3209
+#: build/trans_style.java:3217 build/trans_style.java:3225
 msgid "military"
 msgstr ""
@@ -20321 +20982 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3167
+#: build/trans_style.java:3166
 msgid "cemetery"
 msgstr ""
@@ -20332 +20993 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3243
+#: build/trans_style.java:3242
 msgid "peak"
 msgstr ""
@@ -20345 +21006 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3252
+#: build/trans_style.java:3251
 msgid "glacier"
 msgstr ""
@@ -20357 +21018 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3260
+#: build/trans_style.java:3259
 msgid "volcano"
 msgstr ""
@@ -20410 +21071 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3268 build/trans_style.java:3269
-#: build/trans_style.java:3277 build/trans_style.java:3293
-#: build/trans_style.java:3366 build/trans_style.java:3374
-#: build/trans_style.java:3382
+#: build/trans_style.java:3267 build/trans_style.java:3268
+#: build/trans_style.java:3276 build/trans_style.java:3292
+#: build/trans_style.java:3365 build/trans_style.java:3373
+#: build/trans_style.java:3381
 msgid "natural"
 msgstr ""
@@ -20425 +21086 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3285
+#: build/trans_style.java:3284
 msgid "scrub"
 msgstr ""
@@ -20437 +21098 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3301
+#: build/trans_style.java:3300
 msgid "heath"
 msgstr ""
@@ -20449 +21110 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3309
+#: build/trans_style.java:3308
 msgid "wood"
 msgstr ""
@@ -20461 +21122 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3350
+#: build/trans_style.java:3349
 msgid "mud"
 msgstr ""
@@ -20473 +21134 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3358
+#: build/trans_style.java:3357
 msgid "beach"
 msgstr ""
@@ -20549 +21210 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3398 build/trans_style.java:3406
-#: build/trans_style.java:3414 build/trans_style.java:3422
-#: build/trans_style.java:3430 build/trans_style.java:3438
-#: build/trans_style.java:3446 build/trans_style.java:3454
+#: build/trans_style.java:3397 build/trans_style.java:3405
+#: build/trans_style.java:3413 build/trans_style.java:3421
+#: build/trans_style.java:3429 build/trans_style.java:3437
+#: build/trans_style.java:3445 build/trans_style.java:3453
 msgid "route"
 msgstr ""
@@ -20598 +21259 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3464 build/trans_style.java:3472
-#: build/trans_style.java:3480 build/trans_style.java:3488
-#: build/trans_style.java:3496
+#: build/trans_style.java:3463 build/trans_style.java:3471
+#: build/trans_style.java:3479 build/trans_style.java:3487
+#: build/trans_style.java:3495
 msgid "boundary"
 msgstr ""
@@ -20740 +21401 @@
 #. <condition k="place" v="island"/>
 #. <icon annotate="true" src="place/island.png"/>
-#: build/trans_style.java:3920 build/trans_style.java:3928
-#: build/trans_style.java:3936 build/trans_style.java:3944
-#: build/trans_style.java:3952 build/trans_style.java:3960
-#: build/trans_style.java:3968 build/trans_style.java:3976
-#: build/trans_style.java:3984 build/trans_style.java:3992
-#: build/trans_style.java:4000 build/trans_style.java:4008
+#: build/trans_style.java:3919 build/trans_style.java:3927
+#: build/trans_style.java:3935 build/trans_style.java:3943
+#: build/trans_style.java:3951 build/trans_style.java:3959
+#: build/trans_style.java:3967 build/trans_style.java:3975
+#: build/trans_style.java:3983 build/trans_style.java:3991
+#: build/trans_style.java:3999 build/trans_style.java:4007
 msgid "place"
 msgstr ""
@@ -20791 +21452 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4125 build/trans_style.java:4132
-#: build/trans_style.java:4139 build/trans_style.java:4146
+#: build/trans_style.java:4124 build/trans_style.java:4131
+#: build/trans_style.java:4138 build/trans_style.java:4145
 msgid "address"
 msgstr ""
@@ -21021 +21682 @@
 msgstr ""
 
-#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg
+#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg
 #: build/trans_wms.java:6
 msgid "Open Aerial Map"
 msgstr ""
 
-#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&srs=EPSG:4326&format=image/jpeg
+#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg
 #. fails with division by zero error
 #: build/trans_wms.java:8
@@ -21072 +21733 @@
 msgstr ""
 
+#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms
+#. Terraserver USCG- High resolution maps
+#: build/trans_wms.java:22
+msgid "Terraserver Topo"
+msgstr ""
+
+#. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg
+#: build/trans_wms.java:23
+msgid "Terraserver Urban"
+msgstr ""
+
+#~ msgid "{0} Plugin successfully updated. Please restart JOSM."
+#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
+#~ msgstr[0] "{0} vsavkov uspešno posodobljenih. Ponovno zaženite JOSM."
+#~ msgstr[1] "{0} vsavek uspešno posodobljen. Ponovno zaženite JOSM."
+#~ msgstr[2] "{0} vsavka uspešno posodobljena. Ponovno zaženite JOSM."
+#~ msgstr[3] "{0} vsavki uspešno posodobljeni. Ponovno zaženite JOSM."
+
+#~ msgid "Could not download plugin: {0} from {1}"
+#~ msgstr "Sprejem vstavka {0} z naslova {1} ni bil mogoč"
+
 #~ msgid ""
 #~ "Zoom: Mousewheel or double click.   Move map: Hold right mousebutton and "
@@ -21082 +21764 @@
 #~ msgstr "Prenos prekinjen zaradi napake (5 sekund premora):"
 
+#~ msgid "Plugin requires JOSM update: {0}."
+#~ msgstr "Vstavek zahteva posodobitev programa JOSM: {0}."
+
+#~ msgid "Plugin already exists"
+#~ msgstr "Vstavek že obstaja"
+
+#~ msgid "Error deleting plugin file: {0}"
+#~ msgstr "Napaka pri brisanju datoteke vstavka: {0}"
+
+#~ msgid ""
+#~ "The plugin {0} seems to be broken or could not be downloaded "
+#~ "automatically."
+#~ msgstr ""
+#~ "Vstavek {0} izgleda pokvarjen, ali pa ga ni bilo mogoče samodejno "
+#~ "sprejeti."
+
 #~ msgid "Edit Portcullis"
 #~ msgstr "Uredi dók"