Index: applications/editors/josm/i18n/po/et.po
===================================================================
--- applications/editors/josm/i18n/po/et.po	(revision 16179)
+++ applications/editors/josm/i18n/po/et.po	(revision 16407)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-27 14:26+0200\n"
-"PO-Revision-Date: 2009-06-07 16:39+0000\n"
+"POT-Creation-Date: 2009-07-09 10:40+0200\n"
+"PO-Revision-Date: 2009-07-06 19:13+0000\n"
 "Last-Translator: Margus Värton <margus@dakar.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -16,8 +16,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-06-27 12:18+0000\n"
+"X-Launchpad-Export-Date: 2009-07-09 07:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:189
+#: ../core/src/org/openstreetmap/josm/Main.java:192
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 msgid "Creating main GUI"
@@ -25,6 +25,6 @@
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:198
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59
+#: ../core/src/org/openstreetmap/josm/Main.java:202
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:60
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305
@@ -32,30 +32,31 @@
 msgstr "Abi"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:261
-msgid "The projection could not be read from preferences. Using Mercator"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/Main.java:349
+#: ../core/src/org/openstreetmap/josm/Main.java:281
+#, fuzzy, java-format
+msgid "The projection {0} could not be activated. Using Mercator"
+msgstr "Projektsiooni ei saanud eelistusest lugeda. Kasutan Mercatori"
+
+#: ../core/src/org/openstreetmap/josm/Main.java:394
 msgid "Hint: Some changes came from uploading new data to the server."
 msgstr "Vihje: Mõned muudatused tulid uute andmete üleslaadimisest."
 
-#: ../core/src/org/openstreetmap/josm/Main.java:350
+#: ../core/src/org/openstreetmap/josm/Main.java:395
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79
 msgid "Unsaved Changes"
 msgstr "Salvestamata muudatused"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:351
+#: ../core/src/org/openstreetmap/josm/Main.java:396
 msgid "There are unsaved changes. Discard the changes and continue?"
 msgstr "On salvestamata muudatusi. Tühista muudatused ja jätka?"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:352
+#: ../core/src/org/openstreetmap/josm/Main.java:397
 msgid "Save and Exit"
 msgstr "Salvesta ja välju"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:352
+#: ../core/src/org/openstreetmap/josm/Main.java:397
 msgid "Discard and Exit"
 msgstr "Tühista ja välju"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:352
+#: ../core/src/org/openstreetmap/josm/Main.java:397
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144
@@ -68,12 +69,12 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:361
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:319
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363
 #: ../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/command/DeleteCommand.java:150
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
@@ -87,7 +88,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
-#: ../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:120
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:86
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559
@@ -98,32 +99,32 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:111
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:303
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
 msgid "Cancel"
 msgstr "Katkesta"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:378
+#: ../core/src/org/openstreetmap/josm/Main.java:424
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Ignoreerin vigast URL''i: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:391
+#: ../core/src/org/openstreetmap/josm/Main.java:437
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Ignoreerin vigast faili URL''i: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:75
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:116
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:179
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:76
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:180
 msgid "UNKNOWN"
 msgstr "TUNDMATU"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121
 msgid "About"
 msgstr "Info"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121
 msgid "Display the about screen."
 msgstr "Näita info akent."
@@ -131,10 +132,10 @@
 #. TODO: put in a platformHook for system that have no console by default
 #. Add the name of this application
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:130
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:74
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:116
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:131
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:75
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:117
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:166
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:158
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:154
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
@@ -142,27 +143,28 @@
 
 #. Add the version number
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:135
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:61
 #, java-format
 msgid "Version {0}"
 msgstr "Versioon {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:136
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137
 #, java-format
 msgid "Last change at {0}"
 msgstr "Viimane muudatus {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139
 #, java-format
 msgid "Java Version {0}"
 msgstr "Java versioon {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141
 msgid "Homepage"
 msgstr "Koduleht"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143
 msgid "Bug Reports"
-msgstr "Vigadest Teatamine"
+msgstr "Vigadest teatamine"
 
 #. <button label="Camping" hotkey="Z" icon="caravan">
@@ -170,5 +172,5 @@
 #. <action class="SetWaypointAction" params="Camping"/>
 #. </button>
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: build/trans_surveyor.java:64
@@ -176,27 +178,27 @@
 msgstr "Teave"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147
 msgid "Readme"
 msgstr "Loemind"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
 msgid "Revision"
 msgstr "Revisjon"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
 msgid "Contribution"
 msgstr "Panus"
 
-#: ../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:192
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190
 msgid "Plugins"
 msgstr "Pistikud"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:154
 msgid "About JOSM..."
 msgstr "JOSM -i kohta ..."
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:191
 msgid "File could not be found."
 msgstr "Faili ei leitud"
@@ -210,14 +212,13 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58
-#, fuzzy
 msgid "Please select at least one already uploaded node, way, or relation."
-msgstr "Palun vali vähemalt üks sõlm või tee."
+msgstr "Palun vali vähemalt üks juba üles laetud sõl, tee või relatsioon."
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
 msgid "Warning"
-msgstr ""
+msgstr "Hoiatus"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:69
@@ -270,5 +271,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:83
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:81
 msgid "Latitude"
 msgstr "Laiuskraad"
@@ -277,5 +278,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:86
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:84
 msgid "Longitude"
 msgstr "Pikkuskraad"
@@ -283,5 +284,5 @@
 #: ../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:242
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:246
 msgid "Align Nodes in Circle"
 msgstr "Paiguta sõlmed ringikujuliselt."
@@ -294,5 +295,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
@@ -359,9 +360,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:65
 msgid "Failed to initialize API. Please try again later."
-msgstr ""
+msgstr "API initsialiseerimine ebaõnnestus. Palun proovige hiljem uuesti."
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:66
 msgid "API initialization failed"
-msgstr ""
+msgstr "API initsialiseerimine ebaõnnestus"
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85
@@ -380,7 +381,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:97
-#, fuzzy
 msgid "Precondition Violation"
-msgstr "Konfliktne relatsioon"
+msgstr "Eeltingimuste rikkumine"
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:111
@@ -389,37 +389,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "data"
 msgstr "andmed"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "layer"
 msgstr "kiht"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "selection"
 msgstr "valik"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
 msgid "conflict"
 msgstr "konflikt"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "download"
 msgstr "allalaetule"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Suumi {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Suumi vaade {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
@@ -429,9 +429,9 @@
 msgstr "Vaade: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89
 msgid "Nothing selected to zoom to."
 msgstr "Ei ole valitud midagi, millele suumida"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89
 msgid "No conflicts to zoom to"
 msgstr "Ei ole vastuolusid, millele suumida"
@@ -522,37 +522,41 @@
 msgstr "Palun vali kopeerimiseks mõni objekt."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:182
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:264
 msgid "Create Circle"
 msgstr "Moodusta ring"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43
 msgid "Create a circle from three selected nodes."
 msgstr "Moodusta valitud kolmest sõlmest ring."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:101
-msgid "Please select exactly three nodes or one way with exactly three nodes."
-msgstr "Palun vali täpselt kolm sõlme või tee täpselt kolme sõlmega."
-
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:201
 msgid "Those nodes are not in a circle."
 msgstr "Need sõlmed ei ole ringis."
+
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:260
+#, fuzzy
+msgid ""
+"Please select exactly two or three nodes or one way with exactly two or "
+"three nodes."
+msgstr "Palun vali täpselt kolm sõlme või tee täpselt kolme sõlmega."
 
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20
 #: ../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:332
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:325
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:623
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:65
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:123
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:96
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:76
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:139
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183
 #: ../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:215
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:538
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:600
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "Delete"
 msgstr "Kustuta"
@@ -602,5 +606,5 @@
 #: ../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:80
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81
 #, java-format
 msgid "File: {0}"
@@ -671,5 +675,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:92
 msgid "E-Mail"
-msgstr ""
+msgstr "E-post"
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:96
@@ -707,11 +711,12 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:561
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:563
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:68
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:71
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:554
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:557
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:561
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:763
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:766
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:770
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
@@ -722,5 +727,5 @@
 #: ../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:356
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
 msgid "Error"
 msgstr "Viga"
@@ -730,30 +735,30 @@
 msgstr "Vali eeldefineeritud litsents"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50
 msgid "JOSM Online Help"
 msgstr "JOSM võrguabi"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:88
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:108
 msgid "Open in Browser"
 msgstr "Ava sirvikus"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:115
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:86
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:169
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:507
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:569
 msgid "Edit"
 msgstr "Muuda"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:129
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
@@ -761,19 +766,19 @@
 msgstr "Lae uuesti"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:112
 msgid "Can only edit help pages from JOSM Online Help"
 msgstr "Ainult JOSM võrguabi lehekülgi saab toimetada."
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:189
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:190
 #, java-format
 msgid "Error while loading page {0}"
 msgstr "Viga lehekülje {0} laadimisel."
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:207
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:208
 #, java-format
 msgid "Help page missing. Create it in <A HREF=\"{0}\">english</A>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:212
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:213
 #, java-format
 msgid ""
@@ -788,18 +793,15 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:16
-#, fuzzy
 msgid "Display history information about OSM ways, nodes, or relations."
-msgstr "Näita OSM sõlmede ja teede ajalugu."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18
-#, fuzzy
 msgid "Info about Element"
-msgstr "Elemendi ajalugu."
+msgstr "Info elemendi kohta"
 
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16
-#, fuzzy
 msgid "Display object information about OSM nodes, ways, or relations."
-msgstr "Näita OSM sõlmede ja teede ajalugu."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
@@ -858,5 +860,5 @@
 #: ../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
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:71
 msgid "Mirror"
 msgstr "Peegelda"
@@ -895,10 +897,10 @@
 msgstr "Paremale"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55
 #, java-format
 msgid "Move {0}"
 msgstr "Liiguta {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
 #, java-format
 msgid "Moves Objects {0}"
@@ -906,5 +908,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:105
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:236
 msgid "Cannot move objects outside of the world."
 msgstr "Objekte ei saa maailmast välja viia"
@@ -1098,5 +1100,5 @@
 msgstr "Fail {0} on juba olemas. Kas kirjutan üle?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:84
 msgid ""
 "Internal Error: cannot check conditions for no layer. Please report this as "
@@ -1106,26 +1108,25 @@
 "sellest veast arendajaid."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:85
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:88
 msgid "No document open so nothing to save."
 msgstr "Ühtegi dokumenti pole avatud! Midagi pole salvestada."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "Empty document"
 msgstr "Tühi dokument"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "The document contains no data."
 msgstr "Dokumendis ei ole andmeid."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "Save anyway"
 msgstr "Salvesta ikkagi."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:136
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
 msgid "Conflicts"
 msgstr "Konfliktid"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:98
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -1135,36 +1136,36 @@
 "tagasi. Jätkame?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102
 msgid "Reject Conflicts and Save"
 msgstr "Lahenda vastuolud ja salvesta."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:109
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
 msgid "Save OSM file"
 msgstr "Salvesta OSM fail."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:111
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115
 msgid "Save GPX file"
 msgstr "Salvesta GPX fail"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116
 msgid "Save Layer"
 msgstr "Salvesta kiht"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:122
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126
 msgid "Could not back up file."
 msgstr "Ei saa faili varundada."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:185
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:228
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:190
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233
 msgid "Unknown file extension."
 msgstr "Tundmatu faililaiend."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:191
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:196
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238
 msgid "An error occurred while saving."
 msgstr "Salvestamisel ilmnes viga."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:201
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:243
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:248
 msgid "An error occurred while restoring backup file."
 msgstr "Varundatud faili taastamisel ilmnes viga"
@@ -1214,6 +1215,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:100
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:207
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:871
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870
 msgid "Close"
 msgstr "Sulge"
@@ -1284,11 +1286,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:314
-#, fuzzy
 msgid ""
 "A relation membership was copied to all new ways.\n"
 "You should verify this and correct it when necessary."
 msgstr ""
-"Rollipõhised seosed kopeeriti uutele teedele.\n"
-"Vaata need igaks juhuks üle."
+"Relatsiooni liikmelisus kopeeriti kõikidele uutele teedele.\n"
+"Seda tuleb kontrollida ning vajadused viia sisse parandused."
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:319
@@ -1439,5 +1440,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:58
 msgid "Failed to update the selected primitives."
-msgstr ""
+msgstr "Valitud primitiivide uuendamine ebaõnnestus."
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:59
@@ -1452,10 +1453,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:72
 msgid "Missing primitive"
-msgstr ""
+msgstr "Puuduv primitiiv"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:103
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:107
 msgid "Update Selection"
-msgstr ""
+msgstr "Uuenda valik"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:105
@@ -1465,74 +1466,74 @@
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:119
 msgid "There are no selected primitives to update."
-msgstr ""
+msgstr "Ei ole valitud primitiive mida uuendada."
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120
 msgid "Selection empty"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:79
+msgstr "Tühi valik"
+
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81
 msgid "Upload to OSM..."
 msgstr "Lae OSMi serverisse"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
 msgid "Upload all changes to the OSM server."
 msgstr "Lae kõik muudatused OSM serverisse üles."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:99
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:100
 msgid "Objects to add:"
 msgstr "Objektid lisada:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108
 msgid "Objects to modify:"
 msgstr "Objektid muuta:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116
 msgid "Objects to delete:"
 msgstr "Objektid kustutada:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:123
 msgid "Provide a brief comment for the changes you are uploading:"
 msgstr "Esitada lühike kommentaar üleslaetavatele muutustele:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:132
 msgid "Upload these changes?"
 msgstr "Kas laen need muudatused üles?"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
 msgid "Upload Changes"
 msgstr "Lae muudatused üles"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
 msgid "Nothing to upload. Get some data first."
 msgstr "Midagi pole üles laadida. Hangi esmalt andmeid."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164
 msgid "There are unresolved conflicts. You have to resolve these first."
 msgstr "Lahendamata konfliktid! Sa pead need enne lahendama."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187
 msgid "No changes to upload."
 msgstr "Pole muudatusi mida üles laadida."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:210
 msgid "Uploading"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:259
+msgstr "Üleslaadimine"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:261
 msgid "Updating primitive"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:315
+msgstr "Primitiivi uuendamine"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317
 #, java-format
 msgid "Synchronize {0} {1} only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:316
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:318
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362
 msgid "Synchronize entire dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:320
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:322
 #, java-format
 msgid ""
@@ -1546,17 +1547,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:337
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:377
 msgid "Conflict detected"
-msgstr ""
+msgstr "Avastatud konflikt"
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:349
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:388
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:390
 #, java-format
 msgid "unexpected return value. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:366
 #, java-format
 msgid ""
@@ -1567,10 +1568,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:404
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:406
 #, java-format
 msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:417
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:419
 #, java-format
 msgid ""
@@ -1580,9 +1581,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:424
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426
 msgid "Precondition violation"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:457
+msgstr "Eelitingimuste rikkumine"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:459
 #, java-format
 msgid ""
@@ -1592,18 +1593,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:468
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:470
 msgid "Primitive already deleted"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:489
+msgstr "Primitiiv on juba kustutatud"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:491
 #, java-format
 msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:544
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:546
 msgid "Upload to OSM API failed"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:557
+msgstr "Laadimine OSM API-le ebaõnnestus"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:559
 #, java-format
 msgid ""
@@ -1708,25 +1709,16 @@
 msgstr "Toored GPS andmed"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:46
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:45
 msgid "Downloading data"
 msgstr "Andmete allalaadimine"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:64
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:63
 msgid "No data imported."
 msgstr "Andmeid ei imporditud."
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:71
-#, java-format
-msgid "Data Layer {0}"
-msgstr "Andmekiht {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:88
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:87
 msgid "OpenStreetMap data"
 msgstr "Openstreetmapi andmed"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:44
-msgid "Data Layer"
-msgstr "Andmekiht"
-
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:54
 #, java-format
@@ -1736,5 +1728,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:94
 msgid "The following errors occurred during mass download:"
-msgstr ""
+msgstr "Massilisel allalaadimisel leidsid aset järgmised vead:"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:95
@@ -1754,5 +1746,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:150
 msgid "Deleted or moved primitives"
-msgstr ""
+msgstr "Kustutatud või nihutatud primitiivid"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:45
@@ -1767,5 +1759,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:96
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:49
 #, java-format
@@ -1836,6 +1828,6 @@
 msgid "Insert new node into way."
 msgid_plural "Insert new node into {0} ways."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Lisa teele uus sõlm."
+msgstr[1] "Lisa {0} teele uus sõlm."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:897
@@ -1866,5 +1858,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:520
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr ""
@@ -1875,5 +1867,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:481
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:524
 msgid "Release the mouse button to stop rotating."
 msgstr ""
@@ -1889,7 +1881,7 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:95
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:96
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:96
@@ -1897,9 +1889,9 @@
 msgstr "Vali"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:95
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97
 msgid "Select, move and rotate objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:198
 #, java-format
 msgid "Add and move a virtual new node to way"
@@ -1908,10 +1900,33 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:479
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:447
+#, fuzzy
+msgid "Move elements"
+msgstr "Liigu vasakule"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:448
+#, java-format
+msgid ""
+"You did move more than {0} elements. Moving a large number of elements is "
+"often an error.\n"
+"Really move them?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451
+#, fuzzy
+msgid "Move them"
+msgstr "Liigu vasakule"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451
+#, fuzzy
+msgid "Undo move"
+msgstr "Võta tagasi"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:522
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:483
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:526
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -1928,5 +1943,5 @@
 msgstr "Suumi ja liiguta kaarti"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74
 msgid ""
 "Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; "
@@ -2184,35 +2199,27 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:106
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:79
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:54
-#: ../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:271
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:497
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:69
-msgid "Add"
-msgstr "Lisa"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:45
-msgid "Change"
-msgstr "Muuda"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:96
+#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:57
+#, fuzzy, java-format
+msgid "Add {0} {1}"
+msgstr "Kustuta {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:46
+#, fuzzy, java-format
+msgid "Change {0} {1}"
+msgstr "Muuda {0} objekt"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:99
 #, java-format
 msgid "Remove \"{0}\" for {1} ''{2}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:97
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:100
 #, java-format
 msgid "Set {0}={1} for {2} ''{3}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:94
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:95
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:73
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:66
@@ -2222,19 +2229,26 @@
 msgstr[1] "objektid"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105
 #, java-format
 msgid "Remove \"{0}\" for {1} {2}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106
 #, java-format
 msgid "Set {0}={1} for {2} {3}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:69
-msgid "ChangeRelationMemberRole"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:54
+#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:68
+#, java-format
+msgid "ChangeRelationMemberRole {0} {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:250
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94
+msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47
 #, java-format
 msgid "Resolve conflicts in coordinates in {0}"
@@ -2242,25 +2256,25 @@
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:74
-#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:83
+#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69
+#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79
 msgid "cannot resolve undecided conflict"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:82
 #, java-format
 msgid "Delete {1} {0}"
 msgstr "Kustuta {1} {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:98
 #, java-format
 msgid "Delete {0} {1}"
 msgstr "Kustuta {0} {1}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
 msgid "Conflicting relation"
 msgstr "Konfliktne relatsioon"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148
 #, java-format
 msgid ""
@@ -2269,11 +2283,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570
 msgid "Delete from relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155
 #, java-format
 msgid ""
@@ -2282,10 +2296,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:366
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:359
 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
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:378
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2294,20 +2308,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:53
+#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47
 #, java-format
 msgid "Resolve conflicts in deleted state in {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118
+#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
 msgid "Move"
 msgstr "Liiguta"
 
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:134
+#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
+#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:154
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:223
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483
 msgid "node"
@@ -2333,43 +2347,49 @@
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:202
+#, java-format
+msgid "removing reference from relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58
+#, java-format
+msgid "Resolve conflicts in member list of relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66
+#, java-format
+msgid "RemoveRelationMember {0} {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
 #, fuzzy, java-format
-msgid "removing reference from relation {0}"
-msgstr "eemalda valikust"
-
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:52
-#, java-format
-msgid "Resolve conflicts in member list 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 ""
-
-#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88
+msgid "Rotate {0} {1}"
+msgstr "Kustuta {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
 msgid "Sequence"
 msgstr "Jada"
 
-#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:72
+#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68
 #, java-format
 msgid "Resolve {0} tag conflicts in {1} {2}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:69
+#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68
 #, java-format
 msgid "Undelete {0} primitives"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41
+#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:40
 #, java-format
 msgid "Resolve version conflicts for {0} {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52
+#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
 #, java-format
 msgid "Resolve conflicts in node list of of way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:75
+msgid "Main.ds doesn't include node {0}"
 msgstr ""
 
@@ -2465,25 +2485,51 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:71
+#, java-format
+msgid "already registered a conflict for primitive ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:87
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
+#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:306
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:141
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:153
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:165
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:177
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:196
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:239
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:70
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:72
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
+#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37
+#, java-format
+msgid "parameter ''{0}'' must not be null"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
 msgid "Decimal Degrees"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:32
 msgid "Degrees Minutes Seconds"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
 msgid "S"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
 msgid "N"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
 msgid "W"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
 msgid "E"
 msgstr ""
@@ -2494,5 +2540,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:130
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:150
 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:95
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:128
@@ -2517,5 +2563,5 @@
 #: ../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:224
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483
 msgid "way"
@@ -2614,17 +2660,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:21
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:30
 msgid "Didn't find an  primitive with id {0} in this dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:27
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:36
 msgid "Didn't find an primitive with id {0} and version {1} in this dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:46
-msgid "Didn't find an historized primitive with id {0} in this dataset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:29
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31
 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:33
 #, java-format
@@ -2632,16 +2674,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:34
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
-#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:306
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
-#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37
-#, java-format
-msgid "parameter ''{0}'' must not be null"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:102
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:104
 msgid "can't compare primitive with id ''{0}'' to primitive with id ''{1}''"
 msgstr ""
@@ -2653,127 +2684,127 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:234
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:230
 msgid "Area style way is not closed."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:442
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:438
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:540
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:787
 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
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:804
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:555
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:564
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:560
 msgid "More than one \"from\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:570
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:566
 msgid "More than one \"to\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:589
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:572
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585
 msgid "More than one \"via\" found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:581
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:594
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:590
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:593
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:598
+msgid "No \"from\" way found."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602
-msgid "No \"from\" way found."
+msgid "No \"to\" way found."
 msgstr ""
 
 #: ../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:610
 msgid "No \"via\" node or way found."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:615
+msgid "The \"from\" way doesn't start or end at a \"via\" node."
+msgstr ""
+
 #: ../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: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:631
+msgid "The \"from\" way doesn't start or end at the \"via\" way."
+msgstr ""
+
 #: ../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: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:757
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:753
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:813
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:809
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:824
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:869
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:959
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:955
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:970
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:966
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1021
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1017
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1046
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1042
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1243
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1239
 msgid "untagged"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1244
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1240
 msgid "text"
 msgstr ""
@@ -2781,5 +2812,5 @@
 #. should not happen
 #.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:225
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:234
 #, java-format
 msgid ""
@@ -2807,6 +2838,6 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:187
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:144
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:162
 msgid "background"
 msgstr "taust"
@@ -2816,19 +2847,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:23
-msgid "EPSG:4326"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110
-#, java-format
-msgid ""
-"The projection \"{0}\" is designed for\n"
-"latitudes between 46.1° and 57° only.\n"
-"Use another projection system if you are not using\n"
-"a French WMS server.\n"
-"Do not upload any data after this message."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:126
+#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27
+msgid "WGS84 Geographisch"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:117
 msgid ""
 "IMPORTANT : data positioned far away from\n"
@@ -2839,30 +2860,24 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:158
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:149
 msgid "Lambert Zone (France)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:98
 msgid "Lambert Zone (Estonia)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:36
+#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:38
 msgid "Mercator"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:45
-#, java-format
-msgid ""
-"The projection \"{0}\" is designed for\n"
-"latitudes between 45.7° and 47.9°\n"
-"and longitutes between 5.7° and 10.6° only.\n"
-"Use another projection system if you are not working\n"
-"on a data set of Switzerland or Liechtenstein.\n"
-"Do not upload any data after this message."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:138
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:92
 msgid "Swiss Grid (Switzerland)"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:339
+#, fuzzy, java-format
+msgid "UTM Zone {0}"
+msgstr "Liiguta {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:43
@@ -2874,14 +2889,14 @@
 msgstr "Ei suutnud salvestada järjehoidjat"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:76
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:77
 msgid "Message of the day not available"
 msgstr "Päeva sõnum pole saadaval"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:81
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:82
 #, java-format
 msgid "- running version is {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:118
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:119
 msgid "Downloading \"Message of the day\""
 msgstr "Laen alla \"päeva sõnumit\""
@@ -3072,5 +3087,4 @@
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:38
 #, java-format
 msgid "Menu: {0}"
@@ -3088,5 +3102,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:249
 msgid "Full Screen"
-msgstr ""
+msgstr "Täisekraan"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:251
@@ -3132,5 +3146,5 @@
 msgstr "Vähenda"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:47
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44
 msgid "scale"
 msgstr ""
@@ -3164,8 +3178,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:239
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:254
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:245
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:261
 msgid "layer not in list."
 msgstr "kiht ei ole nimekirjas"
+
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:352
+#, java-format
+msgid "Layer {0} must be in list of layers"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:27
@@ -3173,9 +3192,9 @@
 msgstr "Ühendun OSM serveriga"
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:105
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:98
 msgid "Error while parsing"
 msgstr "Viga parsimisel"
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:108
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:101
 msgid "File not found"
 msgstr ""
@@ -3235,4 +3254,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228
@@ -3242,4 +3262,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:74
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:170
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
 msgid "Nodes"
 msgstr ""
@@ -3247,5 +3269,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:203
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
 msgid "Members"
 msgstr "Liikmed"
@@ -3441,7 +3464,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:304
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:186
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
 msgid "Remove"
@@ -3521,4 +3544,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:76
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:106
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133
 msgid "parameter '{0}' must not be null"
@@ -3526,4 +3552,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81
 #, java-format
 msgid ""
@@ -3533,4 +3560,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:899
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96
 #, java-format
 msgid "adjustable {0} not registered yet"
@@ -3646,7 +3674,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:375
-#, fuzzy
 msgid "Keep a clone of the local version"
-msgstr "Palun sisesta koha nimi."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:377
@@ -3688,7 +3715,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624
-#, fuzzy
 msgid "No, abort"
-msgstr "Ei ole shortcuti."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:586
@@ -3720,7 +3746,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:633
-#, fuzzy
 msgid "Remove from dataset"
-msgstr "eemalda valikust"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:647
@@ -3731,9 +3756,11 @@
 #: ../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:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19
 msgid "Role"
 msgstr "Roll"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:25
 msgid "Primitive"
 msgstr ""
@@ -3751,4 +3778,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:47
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:34
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:51
 msgid "<undefined>"
 msgstr ""
@@ -3772,8 +3801,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:158
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:137
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:69
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:94
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:234
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18
@@ -3784,7 +3813,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:137
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:69
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78
@@ -3840,5 +3870,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:65
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:66
 msgid "Command Stack"
 msgstr "Käsujada"
@@ -3849,6 +3879,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:70
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458
@@ -3859,5 +3889,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74
@@ -3866,10 +3896,27 @@
 msgstr "Lülita ümber: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:64
 #, java-format
 msgid "Command Stack: {0}"
 msgstr "Käsujada: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:52
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
+msgid "Conflict"
+msgstr "Vastuolu"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119
+msgid "Merging conflicts."
+msgstr "Ühendan vastuolusid."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:326
+msgid "Resolve"
+msgstr "Lahenda"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327
+msgid "Open a merge dialog of all selected items in the list above."
+msgstr "Ava ülalolevast nimekirjast valitud kõigi objektide ühendamisdialoog."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97
@@ -3878,26 +3925,4 @@
 msgstr ""
 "Pane valitud elemendid kaardil ülal asuvasse valitud objektide nimekirja."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61
-msgid "Resolve"
-msgstr "Lahenda"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
-msgid "Open a merge dialog of all selected items in the list above."
-msgstr "Ava ülalolevast nimekirjast valitud kõigi objektide ühendamisdialoog."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:69
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:70
-msgid "Conflict"
-msgstr "Vastuolu"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:69
-msgid "Merging conflicts."
-msgstr "Ühendan vastuolusid."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:134
-#, java-format
-msgid "Conflicts: {0}"
-msgstr "Konfliktid: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:130
@@ -3934,45 +3959,48 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:88
-msgid "Click Reload to refresh list"
-msgstr "Vajuta \"Lae uuesti\" et nimekirja uuendada"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
 msgid "History"
 msgstr "Ajalugu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
 msgid "Display the history of all selected items."
 msgstr "Näita kõigi valitud objektide ajalugu."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:103
-msgid "Object"
-msgstr "Objekt"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:103
-msgid "Date"
-msgstr "Kuupäev"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:129
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:252
+#, java-format
+msgid "<html>Failed to load history from the server. Details:<br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:309
+#, java-format
+msgid "index out of bounds Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:364
+msgid "History item"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:385
+msgid "Load history"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:410
+#, java-format
+msgid "Loading history for {0} with id {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:486
 msgid "Reload all currently selected objects and refresh the list."
 msgstr "Lae kõik hetkel valitud objektid uuesti ja värskenda nimekirja."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:135
-msgid "Revert"
-msgstr "Taasta"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:136
-msgid ""
-"Revert the state of all currently selected objects to the version selected "
-"in the history list."
-msgstr ""
-"Taasta kõigi hetkel valitud objektide olek ajaloo nimekirjas valitud "
-"versiooniks."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:138
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:181
-msgid "Not implemented yet."
-msgstr "Pole veel teostatud."
+#. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:505
+msgid "Show"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:506
+msgid "Display the history of the selected primitive"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:65
@@ -4105,4 +4133,18 @@
 msgid "Add Properties"
 msgstr "Lisa seaded"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:122
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160
+#: ../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:271
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:67
+msgid "Add"
+msgstr "Lisa"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:612
@@ -4215,9 +4257,9 @@
 msgstr "Valik: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:160
 msgid "Undock the panel"
 msgstr "Lase paneel vabaks"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:208
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:212
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -4225,5 +4267,5 @@
 "Sulge see paneel. Te saate selle uuesti avada nupust vasakul tööriistaribal."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:220
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:224
 msgid "Click to minimize/maximize the panel content"
 msgstr "Vajuta et minimeerida/maksimeerida paneeli sisu"
@@ -4253,179 +4295,101 @@
 
 #. We need this twice, so cache result
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:98
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:129
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:72
 msgid "Apply Changes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:116
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:147
 msgid "Basic"
 msgstr "Lihtne"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
 msgid "Occupied By"
 msgstr "Kasutab"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
 msgid "linked"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:201
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:232
 msgid "Tags (empty value deletes tag)"
 msgstr "Sildid (tühi väärtus kustutab sildi)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:271
 msgid "Move Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:271
 msgid "Move the currently selected members up"
 msgstr "Liiguta hetkel valitud liiget ülespoole"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:277
 msgid "Add Selected"
 msgstr "Lisa valitud"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:247
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:278
 msgid "Add all currently selected objects as members"
 msgstr "Lisa kõik hetkel valitud objektid liikmetena"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:253
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:284
 msgid "Remove Selected"
 msgstr "Eemalda valitud"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:254
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:285
 msgid "Remove all currently selected objects from relation"
 msgstr "Eemalda kõik hetkel valitud objektid seosest"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291
+#, fuzzy
+msgid "Sort"
+msgstr "Sport"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292
+msgid "Sort the selected relation members or the whole list"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298
 msgid "Move Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298
 msgid "Move the currently selected members down"
 msgstr "Liiguta hetkel valitud liiget allapoole"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:267
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:305
 msgid "Remove the member in the current table row from this relation"
 msgstr "Eemalda hetkel valitud tabelirea liige sellest seosest"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:280
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:318
 msgid "Download Members"
 msgstr "Lae alla liikmed"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:319
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Lae alla kõik sellest seosest puudu olevad teed ja puntid"
 
-#. end of section to determine linkedness.
-#. item "Streets/Road Restrictions" combo "Access"
-#. item "Streets/Road Restrictions" combo "Bicycle"
-#. item "Streets/Road Restrictions" combo "Foot"
-#. item "Streets/Road Restrictions" combo "Goods"
-#. item "Streets/Road Restrictions" combo "Heavy Goods Vehicles (hgv)"
-#. item "Streets/Road Restrictions" combo "Horse"
-#. item "Streets/Road Restrictions" combo "Motorcycle"
-#. item "Streets/Road Restrictions" combo "Motorcar"
-#. item "Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
-#. item "Streets/Road Restrictions" combo "Motorboat"
-#. item "Streets/Road Restrictions" combo "Boat"
-#. item "Ways/Track" combo "Access"
-#. item "Ways/Track" combo "Motorcycle"
-#. item "Ways/Track" combo "Motorcar"
-#. item "Ways/Track Grade 1" combo "Access"
-#. item "Ways/Track Grade 1" combo "Motorcycle"
-#. item "Ways/Track Grade 1" combo "Motorcar"
-#. item "Ways/Track Grade 2" combo "Access"
-#. item "Ways/Track Grade 2" combo "Motorcycle"
-#. item "Ways/Track Grade 2" combo "Motorcar"
-#. item "Ways/Track Grade 3" combo "Access"
-#. item "Ways/Track Grade 3" combo "Motorcycle"
-#. item "Ways/Track Grade 3" combo "Motorcar"
-#. item "Ways/Track Grade 4" combo "Access"
-#. item "Ways/Track Grade 4" combo "Motorcycle"
-#. item "Ways/Track Grade 4" combo "Motorcar"
-#. item "Ways/Track Grade 5" combo "Access"
-#. item "Ways/Track Grade 5" combo "Motorcycle"
-#. item "Ways/Track Grade 5" combo "Motorcar"
-#. item "Ways/Path" combo "Motorcar"
-#. item "Ways/Path" combo "Snowmobile"
-#. item "Ways/Path" combo "Horse"
-#. item "Ways/Path" combo "Bicycle"
-#. item "Ways/Path" combo "Ski"
-#. item "Ways/Path" combo "Foot"
-#. item "Car/Parking" combo "Spaces for Disabled"
-#. item "Amenities/Toilets" combo "Fee"
-#. item "Health/Pharmacy" combo "Dispensing"
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:419
-#: build/trans_presets.java:312 build/trans_presets.java:313
-#: build/trans_presets.java:314 build/trans_presets.java:315
-#: build/trans_presets.java:316 build/trans_presets.java:317
-#: build/trans_presets.java:318 build/trans_presets.java:319
-#: build/trans_presets.java:320 build/trans_presets.java:321
-#: build/trans_presets.java:322 build/trans_presets.java:516
-#: build/trans_presets.java:517 build/trans_presets.java:518
-#: build/trans_presets.java:537 build/trans_presets.java:538
-#: build/trans_presets.java:539 build/trans_presets.java:558
-#: build/trans_presets.java:559 build/trans_presets.java:560
-#: build/trans_presets.java:579 build/trans_presets.java:580
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: 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_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:638
-#: build/trans_presets.java:639 build/trans_presets.java:640
-#: build/trans_presets.java:641 build/trans_presets.java:1368
-#: build/trans_presets.java:2309 build/trans_presets.java:2573
-msgid "yes"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:419
-#: build/trans_presets.java:312 build/trans_presets.java:313
-#: build/trans_presets.java:314 build/trans_presets.java:315
-#: build/trans_presets.java:316 build/trans_presets.java:317
-#: build/trans_presets.java:318 build/trans_presets.java:319
-#: build/trans_presets.java:320 build/trans_presets.java:321
-#: build/trans_presets.java:322 build/trans_presets.java:516
-#: build/trans_presets.java:517 build/trans_presets.java:518
-#: build/trans_presets.java:537 build/trans_presets.java:538
-#: build/trans_presets.java:539 build/trans_presets.java:558
-#: build/trans_presets.java:559 build/trans_presets.java:560
-#: build/trans_presets.java:579 build/trans_presets.java:580
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: 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_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:638
-#: build/trans_presets.java:639 build/trans_presets.java:640
-#: build/trans_presets.java:641 build/trans_presets.java:758
-#: build/trans_presets.java:773 build/trans_presets.java:1306
-#: build/trans_presets.java:1368 build/trans_presets.java:2309
-#: build/trans_presets.java:2573
-msgid "no"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:424
-#, java-format
-msgid "Members: {0}"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:633
+#, fuzzy, java-format
+msgid "Members: {0} (linked: {1})"
 msgstr "Liikmed: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:432
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641
 #, java-format
 msgid "Relation Editor: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:543
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:752
 msgid "There were conflicts during import."
 msgstr "Importimisel tekkisid konfliktid."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:553
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:762
 msgid "Error parsing server response."
 msgstr "Viga serveri vastuse töötlemisel."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:556
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:765
 msgid "Cannot connect to server."
 msgstr "Ei saa serveriga ühenduda."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:560
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:769
 msgid "Error when communicating with server."
 msgstr ""
@@ -4460,21 +4424,21 @@
 msgstr "Vali enne järjehoidja."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
 msgid "min lat"
 msgstr "min lat"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:112
 msgid "min lon"
 msgstr "min lon"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
 msgid "max lat"
 msgstr "max lat"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:115
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:116
 msgid "max lon"
 msgstr "max lon"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:118
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:119
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -4483,5 +4447,5 @@
 "URL lehelt www.openstreetmap.org (saad kleepida siia allalaetava ala URL''i)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:130
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:131
 msgid "Bounding Box"
 msgstr "Ümbritsev kast"
@@ -4630,657 +4594,41 @@
 msgstr "Pildi numbrid"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:279
-#, java-format
-msgid "Images for {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:284
-msgid "Read GPX..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:293
-#, java-format
-msgid "No time for point {0} x {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:298
-#, java-format
-msgid "Cannot read time \"{0}\" from point {1} x {2}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:306
-msgid "No images with readable timestamps found."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:317
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:136
-#, java-format
-msgid "Reading {0}..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:240
-msgid "Geotagged Images"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562
-#, java-format
-msgid "GPS start: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563
-#, java-format
-msgid "GPS end: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565
-#, java-format
-msgid "current delta: {0}s"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566
-msgid "timezone difference: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:278
-msgid "image"
-msgid_plural "images"
-msgstr[0] "pilt"
-msgstr[1] "pildid"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
-#, java-format
-msgid "{0} within the track."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648
-msgid "Sync clock"
-msgstr "Sünkroniseeri kell"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
-msgid "JPEG images (*.jpg)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:707
-#, java-format
-msgid "The date in file \"{0}\" could not be parsed."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:711
-#, java-format
-msgid "There is no EXIF time within the file \"{0}\"."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:715
-msgid "Image"
-msgstr "Pilt"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717
-msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:720
-msgid "GPS unit timezone (difference to photo)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:728
-msgid "Synchronize Time with GPS Unit"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:746
-msgid "Time entered could not be parsed."
-msgstr ""
-
-#: ../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:218
-msgid "gps point"
-msgstr ""
-
-#: ../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:191
-msgid "Draw lines between points for this layer."
-msgstr ""
-
-#: ../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 ""
-
-#: ../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: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 "Kohanda värvi"
-
-#: ../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:334
-msgid "OK"
-msgstr "OK"
-
-#: ../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
-msgid "Default"
-msgstr "Vaikimisi"
-
-#: ../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
-msgid "Choose a color"
-msgstr "Vali värv"
-
-#: ../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:177
-#, java-format
-msgid "Named Trackpoints from {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184
-msgid "Import Audio"
-msgstr "Heli import"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197
-msgid "Wave Audio files (*.wav)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229
-#, java-format
-msgid "Audio markers from {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244
-msgid "Import images"
-msgstr "Piltide import"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314
-#, java-format
-msgid "{0} track, "
-msgid_plural "{0} tracks, "
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315
-#, java-format
-msgid "{0} route, "
-msgid_plural "{0} routes, "
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
-#, java-format
-msgid "{0} waypoint"
-msgid_plural "{0} waypoints"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320
-#, java-format
-msgid "Name: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323
-#, java-format
-msgid "Description: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347
-msgid "Timespan: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354
-msgid "Length: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:673
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
-msgid "Convert to data layer"
-msgstr "Muuda andme kihiks"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
-msgid ""
-"<html>Upload of unprocessed GPS data as map data is considered harmful."
-"<br>If you want to upload traces, look here:"
-msgstr ""
-"<html> Töötlemata GPS andmete üleslaadimist kaardi andmetena loetakse "
-"kahjulikuks. <br> Kui soovite üles laadida radasid, vaata siia:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:678
-#: ../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:698
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:492
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
-#, java-format
-msgid "Converted from: {0}"
-msgstr "Muudetud sellest: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:735
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:826
-msgid "Download from OSM along this track"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721
-msgid "Download everything within:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:724
-#, java-format
-msgid "{0} meters"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:727
-msgid "Maximum area per request:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:730
-#, java-format
-msgid "{0} sq km"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:822
-#, java-format
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:896
-msgid "No GPX track available in layer to associate audio with."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1043
-msgid ""
-"Some waypoints with timestamps from before the start of the track or after "
-"the end were omitted or moved to the start."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1047
-msgid ""
-"Some waypoints which were too far from the track to sensibly estimate their "
-"time were omitted."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:148
-msgid "outside downloaded area"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:226
-#, java-format
-msgid "version {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:265
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277
-#, java-format
-msgid "There were {0} conflicts during import."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:385
-#, java-format
-msgid "{0} consists of:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:389
-#, java-format
-msgid " ({0} deleted.)"
-msgstr " ({0} kustutatud.)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
-msgid "unset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
-#, java-format
-msgid "API version: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:489
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
-msgid "Convert to GPX layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
-#: build/trans_presets.java:1837 build/trans_presets.java:1843
-#: build/trans_presets.java:1849 build/trans_presets.java:1855
-#: build/trans_presets.java:1861 build/trans_presets.java:1867
-#: build/trans_presets.java:1873 build/trans_presets.java:1879
-#: build/trans_presets.java:1885 build/trans_presets.java:1891
-#: build/trans_presets.java:1897 build/trans_presets.java:1903
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
-#: build/trans_presets.java:1937 build/trans_presets.java:1945
-#: build/trans_presets.java:1951 build/trans_presets.java:1957
-#: build/trans_presets.java:1963 build/trans_presets.java:1969
-#: build/trans_presets.java:1975 build/trans_presets.java:1981
-#: build/trans_presets.java:1987 build/trans_presets.java:1993
-#: build/trans_presets.java:1999 build/trans_presets.java:2005
-#: build/trans_presets.java:2011 build/trans_presets.java:2017
-#: build/trans_presets.java:2023 build/trans_presets.java:2029
-#: build/trans_presets.java:2035 build/trans_presets.java:2041
-msgid "track"
-msgid_plural "tracks"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152
-msgid "point"
-msgid_plural "points"
-msgstr[0] "punkt"
-msgstr[1] "punktid"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178
-#, java-format
-msgid "a track with {0} point"
-msgid_plural "a track with {0} points"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
-#, java-format
-msgid "{0} consists of {1} track"
-msgid_plural "{0} consists of {1} tracks"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
-#, java-format
-msgid "{0} point"
-msgid_plural "{0} points"
-msgstr[0] "{0} punkt"
-msgstr[1] "{0} punkti"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
-msgid "gps marker"
-msgstr "gps marker"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
-msgid "marker"
-msgid_plural "markers"
-msgstr[0] "marker"
-msgstr[1] "markerid"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190
-#, java-format
-msgid "{0} consists of {1} marker"
-msgid_plural "{0} consists of {1} markers"
-msgstr[0] "{0} koosneb {1} markerist"
-msgstr[1] "{0} koosneb {1} markerist"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216
-msgid "Synchronize Audio"
-msgstr "Sünkroniseeri heli"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221
-msgid ""
-"You need to pause audio at the moment when you hear your synchronization cue."
-msgstr "Kui kuuled sünkroniseerimisvihjet, pead heli pausile panema."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228
-#, java-format
-msgid "Audio synchronized at point {0}."
-msgstr "Heli sünkroniseeritud punktis {0}."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:232
-msgid "Unable to synchronize in layer being played."
-msgstr "Ei saa sükroniseerida kihis mis mängib."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
-msgid "Make Audio Marker at Play Head"
-msgstr "Loo heli marker mängimise alguses"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
-msgid ""
-"You need to have paused audio at the point on the track where you want the "
-"marker."
-msgstr "Pane heli pausile punktis kuhu sa soovid markerit."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310
-msgid "No existing audio markers in this layer to offset from."
-msgstr "Pole heli markerit millest nihutada."
-
-#. Not close enough to track, or no audio marker found for some other reason
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:166
-msgid ""
-"You need to drag the play head near to the GPX track whose associated sound "
-"track you were playing (after the first marker)."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:214
-msgid ""
-"You need to SHIFT-drag the play head onto an audio marker or onto the track "
-"point where you want to synchronize."
-msgstr ""
-"Pead SHIFT klahvi all hoides lohistama mängimise pea heli markerile või "
-"rajapuhktile kuhu sa soovid sünkroniseerida"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:224
-msgid "Unable to create new audio marker."
-msgstr "Ei saa uut heli markerit luua."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
-msgid "There was an error while trying to display the URL for this marker"
-msgstr "Tekkis viga kui prooviti kuvada selel markeri URL''i"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
-msgid "(URL was: "
-msgstr "(URL oli: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
-msgid "Error displaying URL"
-msgstr "Viga URL''i kuvamisel"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:43
-msgid "Advanced Preferences"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:44
-msgid "Setting Preference entries directly. Use with caution!"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:47
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
-msgid "Search: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:83
-msgid "Current value is default."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:85
-#, java-format
-msgid "Default value is ''{0}''."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:88
-msgid "Default value currently unknown (setting has not been used yet)."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:195
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:67
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:526
-msgid "Please select the row to edit."
-msgstr "PAlun vali rida muutmiseks"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:198
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
-#, java-format
-msgid "New value for {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:207
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:80
-#: ../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:92
-msgid "Please select the row to delete."
-msgstr "Palun vali rida kustutamiseks"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:224
-msgid "Enter a new key/value pair"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:26
-msgid "Display the Audio menu."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:27
-msgid "Label audio (and image and web) markers."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:28
-msgid "Display live audio trace."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:29
-msgid "Create non-audio markers when reading GPX."
-msgstr ""
-
-#. various methods of making markers on import audio
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:32
-msgid "Explicit waypoints with valid timestamps."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
-msgid "Explicit waypoints with time estimated from track position."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:34
-msgid "Named trackpoints."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:35
-msgid "Modified times (time stamps) of audio files."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
-msgid "Start of track (will always do this if no other markers available)."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:46
-msgid "Show or hide the audio menu entry on the main menu bar."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:51
-msgid ""
-"Display a moving icon representing the point on the synchronized track where "
-"the audio currently playing was recorded."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:56
-msgid ""
-"Put text labels against audio (and image and web) markers as well as their "
-"button icons."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:61
-msgid ""
-"Automatically make a marker layer from any waypoints when opening a GPX "
-"layer."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:64
-msgid "When importing audio, make markers from..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:73
-msgid "When importing audio, apply it to any waypoints in the GPX layer."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:78
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:88
-msgid ""
-"Automatically create audio markers from trackpoints (rather than explicit "
-"waypoints) with names or descriptions."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:83
-msgid ""
-"Create audio markers at the position on the track corresponding to the "
-"modified time of each audio WAV file imported."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:92
-msgid ""
-"The number of seconds to jump forward or back when the relevant button is "
-"pressed"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:93
-msgid "Forward/back time (seconds)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:97
-msgid "The amount by which the speed is multiplied for fast forwarding"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:98
-msgid "Fast forward multiplier"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:102
-msgid ""
-"Playback starts this number of seconds before (or after, if negative) the "
-"audio track position requested"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:103
-msgid "Lead-in time (seconds)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:107
-msgid "The ratio of voice recorder elapsed time to true elapsed time"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:108
-msgid "Voice recorder calibration"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:63
-msgid "Color"
-msgstr "Värv"
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:37
+#, java-format
+msgid "History for {0} {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:117
+msgid "Close the dialog"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:179
+msgid "history not initialized yet. Failed to set reference primitive."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:181
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:200
+#, java-format
+msgid "failed to set reference. reference id {0} doesn't match history id {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:184
+#, java-format
+msgid "failed to set reference. reference version {0} not available in history"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:198
+msgid "history not initialized yet. Failed to set current primitive."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:203
+#, java-format
+msgid "failed to set current. current version {0} not available in history"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
+#, java-format
+msgid "Node {0}"
+msgstr ""
 
 #. item "Streets/Motorway" text "Reference"
@@ -5990,5 +5338,6 @@
 #. <key key="type" value="multipolygon" />
 #. <optional>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:64
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
 #: build/trans_presets.java:56 build/trans_presets.java:92
 #: build/trans_presets.java:132 build/trans_presets.java:169
@@ -6139,40 +5488,718 @@
 msgstr "Nimi"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
+#, java-format
+msgid ""
+"<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
+"<strong>{2}</strong></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
+#, java-format
+msgid "Version {0} created on {1} by {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19
+msgid "Version"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277
+#, java-format
+msgid "Images for {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:282
+msgid "Read GPX..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:292
+#, java-format
+msgid "No time for point {0} x {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297
+#, java-format
+msgid "Cannot read time \"{0}\" from point {1} x {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:305
+msgid "No images with readable timestamps found."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:316
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:140
+#, java-format
+msgid "Reading {0}..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:244
+msgid "Geotagged Images"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562
+#, java-format
+msgid "GPS start: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563
+#, java-format
+msgid "GPS end: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565
+#, java-format
+msgid "current delta: {0}s"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566
+msgid "timezone difference: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:282
+msgid "image"
+msgid_plural "images"
+msgstr[0] "pilt"
+msgstr[1] "pildid"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
+#, java-format
+msgid "{0} within the track."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648
+msgid "Sync clock"
+msgstr "Sünkroniseeri kell"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
+msgid "JPEG images (*.jpg)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:704
+#, java-format
+msgid "The date in file \"{0}\" could not be parsed."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:708
+#, java-format
+msgid "There is no EXIF time within the file \"{0}\"."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:712
+msgid "Image"
+msgstr "Pilt"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:714
+msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717
+msgid "GPS unit timezone (difference to photo)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:725
+msgid "Synchronize Time with GPS Unit"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:741
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:743
+msgid "Time entered could not be parsed."
+msgstr ""
+
+#: ../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:218
+msgid "gps point"
+msgstr ""
+
+#: ../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:191
+msgid "Draw lines between points for this layer."
+msgstr ""
+
+#: ../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 ""
+
+#: ../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: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 "Kohanda värvi"
+
+#: ../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:334
+msgid "OK"
+msgstr "OK"
+
+#: ../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
+msgid "Default"
+msgstr "Vaikimisi"
+
+#: ../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
+msgid "Choose a color"
+msgstr "Vali värv"
+
+#: ../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:177
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184
+msgid "Import Audio"
+msgstr "Heli import"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197
+msgid "Wave Audio files (*.wav)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229
+#, java-format
+msgid "Audio markers from {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244
+msgid "Import images"
+msgstr "Piltide import"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314
+#, java-format
+msgid "{0} track, "
+msgid_plural "{0} tracks, "
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315
+#, java-format
+msgid "{0} route, "
+msgid_plural "{0} routes, "
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
+#, java-format
+msgid "{0} waypoint"
+msgid_plural "{0} waypoints"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320
+#, java-format
+msgid "Name: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66
+#, java-format
+msgid "Description: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347
+msgid "Timespan: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354
+msgid "Length: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:664
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
+msgid "Convert to data layer"
+msgstr "Muuda andme kihiks"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
+msgid ""
+"<html>Upload of unprocessed GPS data as map data is considered harmful."
+"<br>If you want to upload traces, look here:"
+msgstr ""
+"<html> Töötlemata GPS andmete üleslaadimist kaardi andmetena loetakse "
+"kahjulikuks. <br> Kui soovite üles laadida radasid, vaata siia:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:669
+#: ../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:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:513
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
+#, java-format
+msgid "Converted from: {0}"
+msgstr "Muudetud sellest: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
+msgid "Download from OSM along this track"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
+msgid "Download everything within:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:715
+#, java-format
+msgid "{0} meters"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:718
+msgid "Maximum area per request:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721
+#, java-format
+msgid "{0} sq km"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:814
+#, java-format
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:888
+msgid "No GPX track available in layer to associate audio with."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033
+msgid ""
+"Some waypoints with timestamps from before the start of the track or after "
+"the end were omitted or moved to the start."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037
+msgid ""
+"Some waypoints which were too far from the track to sensibly estimate their "
+"time were omitted."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:87
+#, java-format
+msgid "Data Layer {0}"
+msgstr "Andmekiht {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:166
+msgid "outside downloaded area"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:245
+#, java-format
+msgid "version {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:284
+msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
+#, java-format
+msgid "There were {0} conflicts during import."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:406
+#, java-format
+msgid "{0} consists of:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:410
+#, java-format
+msgid " ({0} deleted.)"
+msgstr " ({0} kustutatud.)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414
+msgid "unset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414
+#, java-format
+msgid "API version: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
+msgid "Convert to GPX layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
+#: build/trans_presets.java:1837 build/trans_presets.java:1843
+#: build/trans_presets.java:1849 build/trans_presets.java:1855
+#: build/trans_presets.java:1861 build/trans_presets.java:1867
+#: build/trans_presets.java:1873 build/trans_presets.java:1879
+#: build/trans_presets.java:1885 build/trans_presets.java:1891
+#: build/trans_presets.java:1897 build/trans_presets.java:1903
+#: build/trans_presets.java:1909 build/trans_presets.java:1915
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1937 build/trans_presets.java:1945
+#: build/trans_presets.java:1951 build/trans_presets.java:1957
+#: build/trans_presets.java:1963 build/trans_presets.java:1969
+#: build/trans_presets.java:1975 build/trans_presets.java:1981
+#: build/trans_presets.java:1987 build/trans_presets.java:1993
+#: build/trans_presets.java:1999 build/trans_presets.java:2005
+#: build/trans_presets.java:2011 build/trans_presets.java:2017
+#: build/trans_presets.java:2023 build/trans_presets.java:2029
+#: build/trans_presets.java:2035 build/trans_presets.java:2041
+msgid "track"
+msgid_plural "tracks"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152
+msgid "point"
+msgid_plural "points"
+msgstr[0] "punkt"
+msgstr[1] "punktid"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178
+#, java-format
+msgid "a track with {0} point"
+msgid_plural "a track with {0} points"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
+#, java-format
+msgid "{0} consists of {1} track"
+msgid_plural "{0} consists of {1} tracks"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
+#, java-format
+msgid "{0} point"
+msgid_plural "{0} points"
+msgstr[0] "{0} punkt"
+msgstr[1] "{0} punkti"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
+msgid "gps marker"
+msgstr "gps marker"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
+msgid "marker"
+msgid_plural "markers"
+msgstr[0] "marker"
+msgstr[1] "markerid"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190
+#, java-format
+msgid "{0} consists of {1} marker"
+msgid_plural "{0} consists of {1} markers"
+msgstr[0] "{0} koosneb {1} markerist"
+msgstr[1] "{0} koosneb {1} markerist"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216
+msgid "Synchronize Audio"
+msgstr "Sünkroniseeri heli"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221
+msgid ""
+"You need to pause audio at the moment when you hear your synchronization cue."
+msgstr "Kui kuuled sünkroniseerimisvihjet, pead heli pausile panema."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227
+#, java-format
+msgid "Audio synchronized at point {0}."
+msgstr "Heli sünkroniseeritud punktis {0}."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:231
+msgid "Unable to synchronize in layer being played."
+msgstr "Ei saa sükroniseerida kihis mis mängib."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
+msgid "Make Audio Marker at Play Head"
+msgstr "Loo heli marker mängimise alguses"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
+msgid ""
+"You need to have paused audio at the point on the track where you want the "
+"marker."
+msgstr "Pane heli pausile punktis kuhu sa soovid markerit."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310
+msgid "No existing audio markers in this layer to offset from."
+msgstr "Pole heli markerit millest nihutada."
+
+#. Not close enough to track, or no audio marker found for some other reason
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:165
+msgid ""
+"You need to drag the play head near to the GPX track whose associated sound "
+"track you were playing (after the first marker)."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:213
+msgid ""
+"You need to SHIFT-drag the play head onto an audio marker or onto the track "
+"point where you want to synchronize."
+msgstr ""
+"Pead SHIFT klahvi all hoides lohistama mängimise pea heli markerile või "
+"rajapuhktile kuhu sa soovid sünkroniseerida"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:223
+msgid "Unable to create new audio marker."
+msgstr "Ei saa uut heli markerit luua."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
+msgid "There was an error while trying to display the URL for this marker"
+msgstr "Tekkis viga kui prooviti kuvada selel markeri URL''i"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
+msgid "(URL was: "
+msgstr "(URL oli: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
+msgid "Error displaying URL"
+msgstr "Viga URL''i kuvamisel"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
+msgid "Advanced Preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50
+msgid "Setting Preference entries directly. Use with caution!"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
+msgid "Search: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99
+msgid "Current value is default."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101
+#, java-format
+msgid "Default value is ''{0}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:104
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:211
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:138
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:173
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:588
+msgid "Please select the row to edit."
+msgstr "PAlun vali rida muutmiseks"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:214
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
+#, java-format
+msgid "New value for {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:90
+msgid "Please select the row to delete."
+msgstr "Palun vali rida kustutamiseks"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:240
+msgid "Enter a new key/value pair"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
+msgid "Display the Audio menu."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:34
+msgid "Label audio (and image and web) markers."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:35
+msgid "Display live audio trace."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
+msgid "Create non-audio markers when reading GPX."
+msgstr ""
+
+#. various methods of making markers on import audio
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
+msgid "Explicit waypoints with valid timestamps."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40
+msgid "Explicit waypoints with time estimated from track position."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41
+msgid "Named trackpoints."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:42
+msgid "Modified times (time stamps) of audio files."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:43
+msgid "Start of track (will always do this if no other markers available)."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:53
+msgid "Show or hide the audio menu entry on the main menu bar."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:58
+msgid ""
+"Display a moving icon representing the point on the synchronized track where "
+"the audio currently playing was recorded."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:63
+msgid ""
+"Put text labels against audio (and image and web) markers as well as their "
+"button icons."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
+msgid ""
+"Automatically make a marker layer from any waypoints when opening a GPX "
+"layer."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:71
+msgid "When importing audio, make markers from..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:80
+msgid "When importing audio, apply it to any waypoints in the GPX layer."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:95
+msgid ""
+"Automatically create audio markers from trackpoints (rather than explicit "
+"waypoints) with names or descriptions."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:90
+msgid ""
+"Create audio markers at the position on the track corresponding to the "
+"modified time of each audio WAV file imported."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
+msgid ""
+"The number of seconds to jump forward or back when the relevant button is "
+"pressed"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:100
+msgid "Forward/back time (seconds)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
+msgid "The amount by which the speed is multiplied for fast forwarding"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:105
+msgid "Fast forward multiplier"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
+msgid ""
+"Playback starts this number of seconds before (or after, if negative) the "
+"audio track position requested"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:110
+msgid "Lead-in time (seconds)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:114
+msgid "The ratio of voice recorder elapsed time to true elapsed time"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:115
+msgid "Voice recorder calibration"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
+msgid "Color"
+msgstr "Värv"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
 #, java-format
 msgid "Paint style {0}: {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
 #, java-format
 msgid "Layer: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:145
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
 msgid "Choose"
 msgstr "Vali"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:158
 #, java-format
 msgid "Choose a color for {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:157
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:164
 msgid "Set to default"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:174
 msgid "Set all to default"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:217
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:224
 msgid "Colors used by different objects in JOSM."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:239
 msgid "Colors"
 msgstr "Värvid"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/terracer/src/terracer/TerracerAction.java:412
 #: ../plugins/terracer/src/terracer/TerracerAction.java:430
@@ -6181,29 +6208,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Local files"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
 msgid "None"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
 msgid "Force lines if no segments imported."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
 msgid "Draw large GPS points."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
 msgid "Velocity (red = slow, green = fast)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Single Color (can be customized for named layers)"
 msgstr ""
@@ -6211,5 +6238,5 @@
 #. item "Aerialway/Station" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:1350
 msgid "Car"
@@ -6230,5 +6257,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:313 build/trans_presets.java:639
 #: build/trans_presets.java:842 build/trans_presets.java:861
@@ -6266,5 +6293,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:314 build/trans_presets.java:641
 #: build/trans_presets.java:841 build/trans_presets.java:860
@@ -6277,50 +6304,50 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
 msgid "Draw Direction Arrows"
 msgstr "Joonista suuna nooled"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Fast drawing (looks uglier)"
 msgstr ""
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:213
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr ""
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
 msgid "Only on the head of a way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
 msgid "Draw segment order numbers"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw boundaries of downloaded data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw virtual nodes in select mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw inactive layers in other color"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Smooth map graphics (antialiasing)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:81
 msgid "Draw lines between raw GPS points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:103
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to '-1' to "
@@ -6328,34 +6355,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
 msgid "Maximum length for local files (meters)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
 msgid ""
 "Maximum length (in meters) to draw lines. Set to '-1' to draw all lines."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:106
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
 msgid "Maximum length (meters)"
 msgstr ""
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:122
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr ""
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:140
 msgid ""
 "Don't draw arrows if they are not at least this distance away from the last "
@@ -6363,13 +6390,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
 msgid "Minimum distance (pixels)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
 msgid "Draw larger dots for the GPS points."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:169
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:175
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -6377,9 +6404,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:176
 msgid "Colors points and track segments by velocity."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:171
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:177
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -6387,136 +6414,155 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:176
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:181
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:187
 msgid "Track and Point Coloring"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
 msgid "GPS Points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:208
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
 msgid "Draw direction hints for way segments."
 msgstr ""
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:231
 msgid "Draw the order numbers of all segments within their way."
 msgstr ""
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:230
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:235
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
 msgid "Draw the boundaries of data loaded from the server."
 msgstr ""
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:240
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:246
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:245
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:251
 msgid "Draw the inactive data layers in a different color."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
 msgid "OSM Data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:21
+#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:27
 msgid "Keep backup files"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:32
 msgid "When saving, keep backup files ending with a ~"
 msgstr ""
 
 #. Show splash screen on startup
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:32
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:78
 msgid "Show splash screen at startup"
 msgstr ""
 
 #. Show ID in selection
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:33
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:77
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:83
 msgid "Show object ID in selection lists"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:34
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:87
 msgid "Draw rubber-band helper line"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:41
 msgid "Modeless working (Potlatch style)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:91
 msgid "Do not require to switch modes (potlatch style workflow)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:103
 msgid "Look and Feel"
 msgstr "Välimus ja tunnetus"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:58
 msgid "Default (Auto determined)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:62
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:65
 msgid "Language"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
+msgid "Enable built-in defaults"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
+msgid "Enable built-in icon defaults"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:54
+msgid "Used style"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:61
+msgid "Map Paint Styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44
 msgid "Configure available plugins."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
 msgid "Download List"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:206
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
 msgid "Update"
 msgstr "Uuenda"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:65
 msgid "Configure Sites..."
 msgstr ""
 
-#: ../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:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87
 msgid "Add JOSM Plugin description URL."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:89
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105
 msgid "Please select an entry."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98
 msgid "Edit JOSM Plugin description URL."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:112
 msgid "Configure Plugin Sites"
 msgstr ""
 
 #. some common tabs
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
 msgid "Display Settings"
 msgstr "Vaateseadistused"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
 msgid ""
 "Various settings that influence the visual representation of the whole "
@@ -6524,98 +6570,98 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42
 msgid "Connection Settings"
 msgstr "Ühenduse sätted"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42
 msgid "Connection Settings for the OSM server."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43
 msgid "Map Settings"
 msgstr "Kaardi seaded"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43
 msgid "Settings for the map projection and data interpretation."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44
 msgid "Audio Settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44
 msgid "Settings for the audio player and audio markers."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:101
 msgid "You have to restart JOSM for some settings to take effect."
 msgstr "Muudatuste rakendumiseks pead JOSMi taaskäivitama."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:44
-msgid "Map Projection"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:56
+msgid "Display coordinates as"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:59
 msgid "Projection method"
 msgstr "Projektsiooni meetodid"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:49
-msgid "Display coordinates as"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:64
+msgid "Map Projection"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:35
 msgid "Enable proxy server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:38
 msgid "Anonymous"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:71
 msgid "Proxy Settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:67
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:73
 msgid "Proxy server host"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:75
 msgid "Proxy server port"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:78
 msgid "Proxy server username"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:74
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:80
 msgid "Proxy server password"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
 msgid "The base URL for the OSM server (REST API)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:42
 msgid "Login name (e-mail) to the OSM account."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
 msgid "Base Server URL"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:47
 msgid "OSM username (e-mail)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:49
 msgid "OSM password"
 msgstr "OSM parool"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:51
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -6630,75 +6676,108 @@
 #. icon original size: 128x128
 #. modifications: icon was cropped, then resized
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:24
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:29
 msgid "Shortcut Preferences"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:25
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:30
 msgid "Changing keyboard shortcuts manually."
 msgstr ""
 
 #. private String[] columnNames = new String[]{tr("Action"), tr("Shortcut"), tr("Group"), tr("ID")};
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
 msgid "Action"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
 msgid "Shortcut"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+#, fuzzy, java-format
+msgid "Short Description: {0}"
+msgstr "Valik: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+#, fuzzy, java-format
+msgid "URL: {0}"
+msgstr "Kihid: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64
+#, fuzzy, java-format
+msgid "Author: {0}"
+msgstr "Autorid: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:65
+#, fuzzy, java-format
+msgid "Webpage: {0}"
+msgstr "Abi: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:67
+#, fuzzy, java-format
+msgid "Version: {0}"
+msgstr "Versioon {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:241
+msgid "Icon paths"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:194
+#, fuzzy
+msgid "Copy defaults"
+msgstr "Vaikimisi"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:198
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106
+msgid "Please select the row to copy."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:221
+#, java-format
+msgid "The XML source (URL or filename) for {0} definition files."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:222
+#, fuzzy
+msgid "Add a new XML source to the list."
+msgstr "Ühenda uus sõlm olemasoleva teega"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:223
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:616
+msgid "Delete the selected source from the list."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:229
+msgid "Defaults (See tooltip for detailed information)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:38
 msgid "Sort presets menu"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:46
-msgid "Enable built-in defaults"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:69
-msgid "Tagging preset source"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:88
-msgid ""
-"The sources (URL or filename) of tagging preset definition files. See http://"
-"josm.openstreetmap.de/wiki/TaggingPresets for help."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89
-msgid "Add a new tagging preset source to the list."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:554
-msgid "Delete the selected source from the list."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:51
 msgid "Tagging Presets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:97
-msgid "Tagging preset sources"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:131
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:153
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:204
 msgid "Separator"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:301
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:350
 msgid "Toolbar"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:305
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:354
 msgid "Available"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:344
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:393
 msgid "Toolbar customization"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:345
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:394
 msgid "Customize the elements on the toolbar."
 msgstr ""
@@ -6948,6 +7027,6 @@
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:85
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:82
 #: ../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}"
@@ -6956,7 +7035,7 @@
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:55
 #: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40
-#, fuzzy, java-format
+#, java-format
 msgid "File \"{0}\" does not exist"
-msgstr "Fail {0} on juba olemas. Kas kirjutan üle?"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58
@@ -7270,5 +7349,5 @@
 msgid ""
 "WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to "
-"use changesets, but API is not handle them. Ignoring changesets."
+"use changesets, but API is not able to handle them. Ignoring changesets."
 msgstr ""
 
@@ -7278,15 +7357,15 @@
 msgstr "{0}% ({1}/{2}), {3} jäänud. Laen üles {4}: {5} (id: {6})"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83
 msgid "Update Plugins"
 msgstr "Uuenda pistikuid"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:120
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
 msgid "Download Plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:59
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:55
 #, java-format
 msgid ""
@@ -7299,5 +7378,5 @@
 " {0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:61
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:57
 #, java-format
 msgid "{0} Plugin successfully downloaded. Please restart JOSM."
@@ -7306,23 +7385,23 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:68
 #, java-format
 msgid "Downloading Plugin {0}..."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:116
+msgid "Skip download"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117
-msgid "Skip download"
+#, java-format
+msgid "JOSM version {0} required for plugin {1}."
 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
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118
 msgid "Skip Download"
 msgstr ""
@@ -7368,6 +7447,6 @@
 #: ../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
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:245
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255
 msgid "Disable plugin"
 msgstr ""
@@ -7382,5 +7461,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:191
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:189
 msgid ""
 "Activating the updated plugins failed. Check if JOSM has the permission to "
@@ -7388,5 +7467,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:248
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246
 #, java-format
 msgid ""
@@ -7394,19 +7473,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:251
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:249
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:252
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:256
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254
 msgid "Should the plugin be disabled?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:270
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -7414,5 +7493,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:273
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:271
 msgid ""
 "The plugin could not be removed. Please tell the people you got JOSM from "
@@ -7420,19 +7499,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:298
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296
 #: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37
 msgid "Information"
 msgstr "Info"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:134
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:135
 msgid "no description available"
 msgstr "kirjeldust pole saadaval"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:136
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:137
 msgid "More details"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -7441,13 +7520,13 @@
 msgstr[1] "Laadisin alla pluginate info {0} saidilt"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:58
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55
 msgid "No plugin information found."
 msgstr "Pluginate infot ei leitud"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:77
 msgid "All installed plugins are up to date."
 msgstr "Kõik installeeritud pluginad on uuendatud."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:86
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82
 #, java-format
 msgid ""
@@ -7460,9 +7539,9 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:116
 msgid "Download missing plugins"
 msgstr "Lae alla puuduvad pluginad"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:119
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
 #, java-format
 msgid ""
@@ -7475,6 +7554,6 @@
 "{0}"
 
-#: ../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:169
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:178
 #: build/trans_presets.java:312 build/trans_presets.java:313
 #: build/trans_presets.java:314 build/trans_presets.java:315
@@ -7497,14 +7576,14 @@
 msgstr "tundmatu"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:185
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:183
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr "{0}: Versioon {1}{2}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:193
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:191
 msgid "Plugin bundled with JOSM"
 msgstr "Plugin kaasatud JOSMi"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:337
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:319
 #, java-format
 msgid "Error reading plugin information file: {0}"
@@ -7753,45 +7832,45 @@
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:103
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:107
 msgid "Extracting GPS locations from EXIF"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:109
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113
 msgid "Starting directory scan"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:114
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:118
 msgid "One of the selected files was null !!!"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:121
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:125
 msgid "Read photos..."
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:175
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:179
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:187
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:191
 #, java-format
 msgid "Scanning directory {0}"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:192
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:196
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:195
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:199
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:260
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:264
 msgid "Correlate to GPX"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:279
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:283
 #, java-format
 msgid "{0} were found to be gps tagged."
@@ -7990,20 +8069,20 @@
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:779
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778
 #, java-format
 msgid "Matched {0} of {1} photos to GPX track."
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:782
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:781
 #, java-format
 msgid "(Time difference of {0} days)"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:789
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:788
 #, java-format
 msgid "Offset between track and photos: {0}m {1}s"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:851
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:850
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -8011,13 +8090,13 @@
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:853
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:852
 msgid "Matching photos to track failed"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:869
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:868
 msgid "Adjust timezone and offset"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:871
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870
 msgid "Default Values"
 msgstr ""
@@ -8039,5 +8118,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:355
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
 msgid "Error loading file"
 msgstr ""
@@ -8345,6 +8424,6 @@
 msgid "Simplify Way (remove {0} node)"
 msgid_plural "Simplify Way (remove {0} nodes)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Lihtsusta tee (eemalda {0} sõlm)"
+msgstr[1] "Lihtsusta tee (eemalda {0} sõlme)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34
@@ -8371,5 +8450,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155
 msgid "Blank Layer"
 msgstr ""
@@ -8472,17 +8551,18 @@
 
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:110
-#, fuzzy
 msgid "Format errors: "
-msgstr "Kontrollsumma vead: "
+msgstr ""
 
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:112
-#, fuzzy
 msgid "TangoGPS import success"
-msgstr "NMEA import oli edukas."
+msgstr ""
 
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114
-#, fuzzy
 msgid "TangoGPS import faliure!"
-msgstr "NMEA impordi viga!"
+msgstr ""
+
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:65
+msgid "TCX Files (*.tcx)"
+msgstr ""
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75
@@ -8507,5 +8587,5 @@
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:93
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94
 msgid "Layer for editing GPX tracks"
 msgstr ""
@@ -8526,11 +8606,11 @@
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:51
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:101
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:258
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:302
 msgid "Import path from GPX layer"
 msgstr ""
 
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:91
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:292
 msgid "Drop existing path"
 msgstr ""
@@ -8539,6 +8619,6 @@
 #. TODO: register a listener and show menu entry only if gps layers are available
 #. no gps layer
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:135
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:132
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:328
 msgid "No GPX data layer found."
 msgstr ""
@@ -8601,6 +8681,6 @@
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:114
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:115
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116
 msgid "Refresh"
 msgstr ""
@@ -8906,7 +8986,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: 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
+#: build/trans_style.java:952 build/trans_style.java:969
+#: build/trans_style.java:985 build/trans_style.java:3344
+#: build/trans_style.java:3352
 msgid "water"
 msgstr ""
@@ -9235,14 +9315,14 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:95
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
+msgid "Open OpenStreetBugs"
+msgstr ""
+
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
-msgid "Open OpenStreetBugs"
-msgstr ""
-
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
 msgid "Opens the OpenStreetBugs window and activates the automatic download"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:123
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125
 msgid ""
 "The visible area is either too small or too big to download data from "
@@ -9368,19 +9448,19 @@
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:114
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115
 msgid "Remote Control has been asked to load data from the API."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
 #, java-format
 msgid "Request details: {0}"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:213
 msgid "Do you want to allow this?"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:117
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:214
 msgid "Confirm Remote Control action"
@@ -9504,7 +9584,6 @@
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:446
-#, fuzzy
 msgid "image loading..."
-msgstr "Üleslaadimine..."
+msgstr ""
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29
@@ -9692,13 +9771,4 @@
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:34
 msgid "You have to specify tagging preset sources in the preferences first."
-msgstr ""
-
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:37
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:38
-msgid "Import TCX File..."
-msgstr ""
-
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:37
-msgid "Import TCX file as GPS track"
 msgstr ""
 
@@ -9908,33 +9978,33 @@
 msgstr ""
 
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:53
+msgid "Enter Lat/Lon to jump to position."
+msgstr ""
+
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55
-msgid "Enter Lat/Lon to jump to position."
-msgstr ""
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:57
 msgid "You can also paste an URL from www.openstreetmap.org"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:89
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:87
 msgid "Zoom (in metres)"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:92
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:90
 msgid "URL"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93
 msgid "Jump there"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:100
 msgid "Jump to Position"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:112
 msgid "Could not parse Latitude, Longitude or Zoom. Please check."
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:112
 msgid "Unable to parse Lon/Lat"
 msgstr ""
@@ -9942,5 +10012,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:33
 msgid "Simplify Way"
-msgstr ""
+msgstr "Lihtsusta tee"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:33
@@ -9950,5 +10020,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:82
 msgid "Please select at least one way to simplify."
-msgstr ""
+msgstr "Palun vali lihtsustamiseks vähemalt üks tee."
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:87
@@ -9958,5 +10028,7 @@
 "The selection contains {0} ways. Are you sure you want to simplify them all?"
 msgstr[0] ""
+"Valik sisaldab {0} teed. Kas oled kindel, et soovid seda lihtsustada?"
 msgstr[1] ""
+"Valik sisaldab {0} teed. Kas oled kindel, et soovid neid lihtsustada?"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:90
@@ -10240,23 +10312,23 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:141
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:148
 msgid "Properties checker :"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:142
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149
 msgid "This plugin checks for errors in property keys and values."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:218
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:267
 #, java-format
 msgid "Invalid tagchecker line - {0}: {1}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:231
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:280
 #, java-format
 msgid "Invalid spellcheck line: {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:242
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:291
 #, java-format
 msgid ""
@@ -10265,5 +10337,5 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:332
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:381
 msgid "Illegal tag/value combinations"
 msgstr ""
@@ -10271,78 +10343,78 @@
 #. passing translated text also to original string, as we already
 #. translated the stuff before. Makes the ignore file language dependend.
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:345
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:394
 msgid "Painting problem"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:354
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:403
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:359
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:408
 msgid "Tags with empty values"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:365
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:414
 msgid "Invalid property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:371
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:420
 msgid "Invalid white space in property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:377
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
 msgid "Property values start or end with white space"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:383
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:432
 msgid "Property values contain HTML entity"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:407
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:459
 #, java-format
 msgid "Key ''{0}'' not in presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:408
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:460
 msgid "Presets do not contain property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:415
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:476
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:416
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:477
 msgid "Presets do not contain property value"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:488
 msgid "FIXMES"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:534
 msgid "Check property keys."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535
 msgid "Validate that property keys are valid checking against list of words."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542
 msgid "Use complex property checker."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:543
 msgid "Validate property values and tags using complex rules."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:500
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:520
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:530
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:562
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:582
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:592
 msgid "TagChecker source"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:551
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:613
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -10350,74 +10422,82 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:552
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:614
 msgid "Add a new source to the list."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:553
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:615
 msgid "Edit the selected source."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:556
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618
 msgid "Data sources"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:576
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:638
 msgid "Check property values."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:577
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:639
 msgid "Validate that property values are valid checking against presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:584
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646
 msgid "Check for FIXMES."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:585
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647
 msgid "Looks for nodes or ways with FIXME in any property value."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:592
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:654
 msgid "Check for paint notes."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
 msgid "Check if map painting found data errors."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:600
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662
 msgid "Use default data file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
 msgid "Use the default data file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:666
+msgid "Use default tag ignore file."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667
+msgid "Use the default tag ignore file (recommended)."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:670
 msgid "Use default spellcheck file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:605
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:671
 msgid "Use the default spellcheck file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:765
 msgid "Fix properties"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:807
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:879
 msgid "Could not find element type"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:824
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:896
 msgid "Could not find warning level"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:833
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:905
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:837
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:909
 #, java-format
 msgid "Illegal regular expression ''{0}''"
@@ -10562,7 +10642,7 @@
 #. <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:4068 build/trans_style.java:4075
-#: build/trans_style.java:4082 build/trans_style.java:4089
-#: build/trans_style.java:4096
+#: build/trans_style.java:4079 build/trans_style.java:4086
+#: build/trans_style.java:4093 build/trans_style.java:4100
+#: build/trans_style.java:4107
 msgid "building"
 msgstr ""
@@ -10576,5 +10656,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4103
+#: build/trans_style.java:4114
 msgid "area"
 msgstr ""
@@ -10584,25 +10664,25 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:44
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:45
 msgid "Unconnected ways."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
 msgid "This test checks if a way has an endpoint very near to another way."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:78
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:83
 msgid "Way end node near other highway"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:104
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:109
 msgid "Way end node near other way"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:125
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:130
 msgid "Way node near other way"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:143
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:148
 msgid "Connected way end node near other way"
 msgstr ""
@@ -10625,17 +10705,22 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:88
 msgid "Unnamed ways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:89
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:90
+#, fuzzy
+msgid "Unnamed Junction"
+msgstr "ühendus"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:97
 msgid "Untagged ways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:94
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:102
 msgid "Empty ways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:98
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:106
 msgid "One node ways"
 msgstr ""
@@ -10673,14 +10758,14 @@
 msgstr ""
 
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:149
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:146
 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
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:153
 msgid "Reached a junction"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:75
+#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:57
 msgid "Exception occurred"
 msgstr ""
@@ -10778,5 +10863,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125
 #, java-format
 msgid ""
@@ -10789,117 +10874,106 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:118
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:121
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:229
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
 msgid "Download visible tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
 msgid "Change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:250
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
 msgid "Reload erroneous tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:272
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268
 msgid "Alpha channel"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288
 msgid "Save WMS layer to file"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:295
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
 msgid "Save WMS layer"
 msgstr ""
 
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
+msgid "Load WMS layer from file"
+msgstr ""
+
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
-msgid "Load WMS layer from file"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:323
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:334
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:335
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 msgid "File Format Error"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:163
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:142
 msgid "WMS"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155
 msgid "Open a blank WMS layer to load data from a file"
 msgstr ""
 
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39
+msgid "WMS Plugin Preferences"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39
+msgid "Modify list of WMS servers displayed in the WMS plugin menu"
+msgstr ""
+
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
-msgid "WMS Plugin Preferences"
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:72
+msgid "Menu Name"
 msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
-msgid "Modify list of WMS servers displayed in the WMS plugin menu"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74
-msgid "Menu Name"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76
+msgid "WMS URL"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53
+msgid "Menu Name (Default)"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53
+msgid "WMS URL (Default)"
+msgstr ""
+
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78
-msgid "WMS URL"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55
-msgid "Menu Name (Default)"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55
-msgid "WMS URL (Default)"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80
 msgid "Enter a menu name and WMS URL"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Copy Default"
 msgstr ""
 
-#: ../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 "% of lat:"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122
-msgid "% of lon:"
-msgstr ""
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124
+#, fuzzy
+msgid "Downloader:"
+msgstr "Lae alla"
 
 #. *
@@ -11111,16 +11185,11 @@
 msgstr ""
 
-#. Plugin tcx-support
+#. Plugin terracer
 #: build/trans_plugins.java:59
-msgid "Directly load TCX files from JOSM."
-msgstr ""
-
-#. Plugin terracer
+msgid "Make terraced houses out of single blocks."
+msgstr ""
+
+#. Plugin usertools
 #: build/trans_plugins.java:61
-msgid "Make terraced houses out of single blocks."
-msgstr ""
-
-#. Plugin usertools
-#: build/trans_plugins.java:63
 msgid ""
 "Tools to work with authors/users. Selects map data that belongs to selected "
@@ -11129,5 +11198,5 @@
 
 #. Plugin utilsplugin
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:63
 msgid ""
 "Several utilities that make your life easier: e.g. simplify way, join areas, "
@@ -11136,5 +11205,5 @@
 
 #. Plugin validator
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:65
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -11143,10 +11212,10 @@
 
 #. Plugin waydownloader
+#: build/trans_plugins.java:67
+msgid "Easy downloading along a long set of interconnected ways"
+msgstr ""
+
+#. Plugin wmsplugin
 #: build/trans_plugins.java:69
-msgid "Easy downloading along a long set of interconnected ways"
-msgstr ""
-
-#. Plugin wmsplugin
-#: build/trans_plugins.java:71
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -11943,4 +12012,64 @@
 msgstr ""
 
+#. item "Streets/Road Restrictions" combo "Access"
+#. item "Streets/Road Restrictions" combo "Bicycle"
+#. item "Streets/Road Restrictions" combo "Foot"
+#. item "Streets/Road Restrictions" combo "Goods"
+#. item "Streets/Road Restrictions" combo "Heavy Goods Vehicles (hgv)"
+#. item "Streets/Road Restrictions" combo "Horse"
+#. item "Streets/Road Restrictions" combo "Motorcycle"
+#. item "Streets/Road Restrictions" combo "Motorcar"
+#. item "Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
+#. item "Streets/Road Restrictions" combo "Motorboat"
+#. item "Streets/Road Restrictions" combo "Boat"
+#. item "Ways/Track" combo "Access"
+#. item "Ways/Track" combo "Motorcycle"
+#. item "Ways/Track" combo "Motorcar"
+#. item "Ways/Track Grade 1" combo "Access"
+#. item "Ways/Track Grade 1" combo "Motorcycle"
+#. item "Ways/Track Grade 1" combo "Motorcar"
+#. item "Ways/Track Grade 2" combo "Access"
+#. item "Ways/Track Grade 2" combo "Motorcycle"
+#. item "Ways/Track Grade 2" combo "Motorcar"
+#. item "Ways/Track Grade 3" combo "Access"
+#. item "Ways/Track Grade 3" combo "Motorcycle"
+#. item "Ways/Track Grade 3" combo "Motorcar"
+#. item "Ways/Track Grade 4" combo "Access"
+#. item "Ways/Track Grade 4" combo "Motorcycle"
+#. item "Ways/Track Grade 4" combo "Motorcar"
+#. item "Ways/Track Grade 5" combo "Access"
+#. item "Ways/Track Grade 5" combo "Motorcycle"
+#. item "Ways/Track Grade 5" combo "Motorcar"
+#. item "Ways/Path" combo "Motorcar"
+#. item "Ways/Path" combo "Snowmobile"
+#. item "Ways/Path" combo "Horse"
+#. item "Ways/Path" combo "Bicycle"
+#. item "Ways/Path" combo "Ski"
+#. item "Ways/Path" combo "Foot"
+#. item "Car/Parking" combo "Spaces for Disabled"
+#. item "Amenities/Toilets" combo "Fee"
+#. item "Health/Pharmacy" combo "Dispensing"
+#: build/trans_presets.java:312 build/trans_presets.java:313
+#: build/trans_presets.java:314 build/trans_presets.java:315
+#: build/trans_presets.java:316 build/trans_presets.java:317
+#: build/trans_presets.java:318 build/trans_presets.java:319
+#: build/trans_presets.java:320 build/trans_presets.java:321
+#: build/trans_presets.java:322 build/trans_presets.java:516
+#: build/trans_presets.java:517 build/trans_presets.java:518
+#: build/trans_presets.java:537 build/trans_presets.java:538
+#: build/trans_presets.java:539 build/trans_presets.java:558
+#: build/trans_presets.java:559 build/trans_presets.java:560
+#: build/trans_presets.java:579 build/trans_presets.java:580
+#: build/trans_presets.java:581 build/trans_presets.java:600
+#: 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_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:638
+#: build/trans_presets.java:639 build/trans_presets.java:640
+#: build/trans_presets.java:641 build/trans_presets.java:1368
+#: build/trans_presets.java:2309 build/trans_presets.java:2573
+msgid "yes"
+msgstr ""
+
 #. color permissive
 #. <icon annotate="true" src="misc/no_icon.png"/>
@@ -11964,5 +12093,5 @@
 #: 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:188
+#: build/trans_presets.java:623 build/trans_style.java:192
 msgid "private"
 msgstr ""
@@ -12010,5 +12139,5 @@
 #: 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:195
+#: build/trans_presets.java:623 build/trans_style.java:199
 msgid "destination"
 msgstr ""
@@ -12045,5 +12174,5 @@
 #: 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:181
+#: build/trans_presets.java:623 build/trans_style.java:185
 msgid "permissive"
 msgstr ""
@@ -12061,4 +12190,28 @@
 #: build/trans_presets.java:623
 msgid "agricultural"
+msgstr ""
+
+#: build/trans_presets.java:312 build/trans_presets.java:313
+#: build/trans_presets.java:314 build/trans_presets.java:315
+#: build/trans_presets.java:316 build/trans_presets.java:317
+#: build/trans_presets.java:318 build/trans_presets.java:319
+#: build/trans_presets.java:320 build/trans_presets.java:321
+#: build/trans_presets.java:322 build/trans_presets.java:516
+#: build/trans_presets.java:517 build/trans_presets.java:518
+#: build/trans_presets.java:537 build/trans_presets.java:538
+#: build/trans_presets.java:539 build/trans_presets.java:558
+#: build/trans_presets.java:559 build/trans_presets.java:560
+#: build/trans_presets.java:579 build/trans_presets.java:580
+#: build/trans_presets.java:581 build/trans_presets.java:600
+#: 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_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:638
+#: build/trans_presets.java:639 build/trans_presets.java:640
+#: build/trans_presets.java:641 build/trans_presets.java:758
+#: build/trans_presets.java:773 build/trans_presets.java:1306
+#: build/trans_presets.java:1368 build/trans_presets.java:2309
+#: build/trans_presets.java:2573
+msgid "no"
 msgstr ""
 
@@ -12275,6 +12428,6 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:512
-#: build/trans_style.java:520
+#: build/trans_presets.java:338 build/trans_style.java:516
+#: build/trans_style.java:524
 msgid "motorway"
 msgstr ""
@@ -12300,6 +12453,6 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:528
-#: build/trans_style.java:536
+#: build/trans_presets.java:338 build/trans_style.java:532
+#: build/trans_style.java:540
 msgid "trunk"
 msgstr ""
@@ -12325,6 +12478,6 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:544
-#: build/trans_style.java:552
+#: build/trans_presets.java:338 build/trans_style.java:548
+#: build/trans_style.java:556
 msgid "primary"
 msgstr ""
@@ -12350,6 +12503,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:560
-#: build/trans_style.java:568
+#: build/trans_presets.java:338 build/trans_style.java:564
+#: build/trans_style.java:572
 msgid "secondary"
 msgstr ""
@@ -12363,5 +12516,5 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:338 build/trans_style.java:576
+#: build/trans_presets.java:338 build/trans_style.java:580
 msgid "tertiary"
 msgstr ""
@@ -12379,5 +12532,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:338 build/trans_style.java:3084
+#: build/trans_presets.java:338 build/trans_style.java:3095
 msgid "residential"
 msgstr ""
@@ -12395,5 +12548,22 @@
 #. <rule>
 #. <condition k="highway" v="service"/>
-#: build/trans_presets.java:338 build/trans_style.java:632
+#. color address
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <!--public_transport tags -->
+#. <rule>
+#. <condition k="public_transport" v="stop_position"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="public_transport" v="platform"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#: build/trans_presets.java:338 build/trans_style.java:636
+#: build/trans_style.java:4172
 msgid "service"
 msgstr ""
@@ -12420,6 +12590,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:338 build/trans_style.java:834
-#: build/trans_style.java:3149 build/trans_style.java:3150
+#: build/trans_presets.java:338 build/trans_style.java:839
+#: build/trans_style.java:3160 build/trans_style.java:3161
 msgid "construction"
 msgstr ""
@@ -12469,5 +12639,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:400 build/trans_style.java:852
+#: build/trans_presets.java:400 build/trans_style.java:857
 msgid "roundabout"
 msgstr ""
@@ -13446,5 +13616,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1111 build/trans_style.java:3325
+#: build/trans_presets.java:1111 build/trans_style.java:3336
 msgid "marsh"
 msgstr ""
@@ -15175,27 +15345,27 @@
 #: build/trans_presets.java:1792 build/trans_presets.java:1801
 #: build/trans_presets.java:1810 build/trans_presets.java:1819
-#: 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
+#: build/trans_style.java:3516 build/trans_style.java:3524
+#: build/trans_style.java:3532 build/trans_style.java:3540
+#: build/trans_style.java:3548 build/trans_style.java:3556
+#: build/trans_style.java:3564 build/trans_style.java:3572
+#: build/trans_style.java:3580 build/trans_style.java:3588
+#: build/trans_style.java:3596 build/trans_style.java:3604
+#: build/trans_style.java:3612 build/trans_style.java:3620
+#: build/trans_style.java:3628 build/trans_style.java:3636
+#: build/trans_style.java:3644 build/trans_style.java:3652
+#: build/trans_style.java:3660 build/trans_style.java:3668
+#: build/trans_style.java:3676 build/trans_style.java:3684
+#: build/trans_style.java:3692 build/trans_style.java:3700
+#: build/trans_style.java:3708 build/trans_style.java:3716
+#: build/trans_style.java:3724 build/trans_style.java:3732
+#: build/trans_style.java:3740 build/trans_style.java:3748
+#: build/trans_style.java:3756 build/trans_style.java:3764
+#: build/trans_style.java:3772 build/trans_style.java:3780
+#: build/trans_style.java:3788 build/trans_style.java:3796
+#: build/trans_style.java:3804 build/trans_style.java:3812
+#: build/trans_style.java:3820 build/trans_style.java:3828
+#: build/trans_style.java:3836 build/trans_style.java:3844
+#: build/trans_style.java:3852 build/trans_style.java:3860
+#: build/trans_style.java:3868
 msgid "sport"
 msgstr ""
@@ -18033,8 +18203,8 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:2994 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
+#: build/trans_presets.java:2994 build/trans_style.java:213
+#: build/trans_style.java:652 build/trans_style.java:868
+#: build/trans_style.java:876 build/trans_style.java:884
+#: build/trans_style.java:892 build/trans_style.java:900
 msgid "bicycle"
 msgstr "jalgrattaga"
@@ -18103,8 +18273,8 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:2994 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
+#: build/trans_presets.java:2994 build/trans_style.java:227
+#: build/trans_style.java:660 build/trans_style.java:668
+#: build/trans_style.java:676 build/trans_style.java:677
+#: build/trans_style.java:685
 msgid "foot"
 msgstr "jalgsi"
@@ -18130,5 +18300,5 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:2994 build/trans_style.java:1163
+#: build/trans_presets.java:2994 build/trans_style.java:1168
 msgid "subway"
 msgstr "metroo"
@@ -18258,4 +18428,5 @@
 #. <condition k="restriction" v="no_left_turn"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_left_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_left_turn.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18264,4 +18435,5 @@
 #. <condition k="restriction" v="no_right_turn"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_right_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_right_turn.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18270,4 +18442,5 @@
 #. <condition k="restriction" v="no_straight_on"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_straight_on.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_straight_on.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18276,4 +18449,5 @@
 #. <condition k="restriction" v="no_u_turn"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_u_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_u_turn.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18337,7 +18511,7 @@
 #. <rule>
 #. <condition k="tunnel" b="yes"/>
-#: 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
+#: build/trans_style.java:112 build/trans_style.java:126
+#: build/trans_style.java:133 build/trans_style.java:140
+#: build/trans_style.java:147
 msgid "bridge"
 msgstr "sild"
@@ -18395,4 +18569,5 @@
 #. <condition k="highway" v="mini_roundabout"/>
 #. <icon annotate="true" src="vehicle/restriction/roundabout_right.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/roundabout_left.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -18518,7 +18693,7 @@
 #. <rule>
 #. <condition k="mountain_pass" b="yes"/>
-#. color address
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
+#. color service
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
 #. </rule>
 #.
@@ -18601,15 +18776,15 @@
 #. <rule>
 #. <condition k="leisure" v="zoo"/>
-#: 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
+#: build/trans_style.java:119 build/trans_style.java:154
+#: build/trans_style.java:161 build/trans_style.java:168
+#: build/trans_style.java:596 build/trans_style.java:793
+#: build/trans_style.java:1118 build/trans_style.java:2375
+#: build/trans_style.java:3327 build/trans_style.java:3328
+#: build/trans_style.java:3882 build/trans_style.java:4182
+#: build/trans_style.java:4191 build/trans_style.java:4200
+#: build/trans_style.java:4209 build/trans_style.java:4218
+#: build/trans_style.java:4227 build/trans_style.java:4236
+#: build/trans_style.java:4237 build/trans_style.java:4246
+#: build/trans_style.java:4255
 msgid "deprecated"
 msgstr "kasutusest väljas"
@@ -18651,5 +18826,5 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:251 build/trans_style.java:640
+#: build/trans_style.java:255 build/trans_style.java:644
 msgid "horse"
 msgstr "hobused"
@@ -18859,11 +19034,11 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#: 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
+#: build/trans_style.java:362 build/trans_style.java:375
+#: build/trans_style.java:376 build/trans_style.java:389
+#: build/trans_style.java:390 build/trans_style.java:409
+#: build/trans_style.java:410 build/trans_style.java:417
+#: build/trans_style.java:430 build/trans_style.java:431
+#: build/trans_style.java:444 build/trans_style.java:445
+#: build/trans_style.java:458 build/trans_style.java:459
 msgid "barrier"
 msgstr ""
@@ -18901,6 +19076,6 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_style.java:584 build/trans_style.java:600
-#: build/trans_style.java:616 build/trans_style.java:624
+#: build/trans_style.java:588 build/trans_style.java:604
+#: build/trans_style.java:620 build/trans_style.java:628
 msgid "street"
 msgstr "tänav"
@@ -18956,7 +19131,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: 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
+#: build/trans_style.java:612 build/trans_style.java:910
+#: build/trans_style.java:918 build/trans_style.java:926
+#: build/trans_style.java:934 build/trans_style.java:942
 msgid "highway_track"
 msgstr "teerada"
@@ -19012,10 +19187,10 @@
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. color rail
-#: 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
+#: build/trans_style.java:693 build/trans_style.java:1142
+#: build/trans_style.java:1206 build/trans_style.java:1214
+#: build/trans_style.java:1223 build/trans_style.java:1231
+#: build/trans_style.java:1232
 msgid "rail"
-msgstr "ääris"
+msgstr "raudtee"
 
 #. color deprecated
@@ -19034,5 +19209,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:803
+#: build/trans_style.java:808
 msgid "services"
 msgstr ""
@@ -19046,5 +19221,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:811
+#: build/trans_style.java:816
 msgid "ford"
 msgstr ""
@@ -19065,5 +19240,5 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:826
+#: build/trans_style.java:831
 msgid "turningcircle"
 msgstr "tagasipööramisring"
@@ -19078,5 +19253,5 @@
 #. <condition k="highway" v="emergency_access_point"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:843
+#: build/trans_style.java:848
 msgid "emergency_access_point"
 msgstr ""
@@ -19091,5 +19266,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:955 build/trans_style.java:956
+#: build/trans_style.java:960 build/trans_style.java:961
 msgid "riverbank"
 msgstr "jõekallas"
@@ -19103,5 +19278,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:972
+#: build/trans_style.java:977
 msgid "stream"
 msgstr "oja"
@@ -19115,5 +19290,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:988
+#: build/trans_style.java:993
 msgid "dock"
 msgstr "dokk"
@@ -19141,5 +19316,5 @@
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
-#: build/trans_style.java:1010
+#: build/trans_style.java:1015
 msgid "aqueduct"
 msgstr "akvedukt"
@@ -19307,13 +19482,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: 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
+#: build/trans_style.java:1024 build/trans_style.java:1053
+#: build/trans_style.java:1061 build/trans_style.java:1062
+#: build/trans_style.java:1070 build/trans_style.java:1510
+#: build/trans_style.java:1517 build/trans_style.java:1526
+#: build/trans_style.java:1534 build/trans_style.java:1559
+#: build/trans_style.java:1567 build/trans_style.java:1575
+#: build/trans_style.java:1583 build/trans_style.java:1590
+#: build/trans_style.java:1599 build/trans_style.java:1607
+#: build/trans_style.java:1615 build/trans_style.java:1623
 msgid "manmade"
 msgstr "inimtekkeline"
@@ -19375,9 +19550,9 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: 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
+#: build/trans_style.java:1080 build/trans_style.java:1095
+#: build/trans_style.java:1110 build/trans_style.java:1126
+#: build/trans_style.java:1134
 msgid "railwaypoint"
-msgstr "raudteevärk"
+msgstr ""
 
 #. color rail
@@ -19398,10 +19573,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1146 build/trans_style.java:1155
+#: build/trans_style.java:1151 build/trans_style.java:1160
 msgid "otherrail"
 msgstr "muu rööbastee"
 
 #. color otherrail
-#: build/trans_style.java:1147
+#: build/trans_style.java:1152
 msgid "railover"
 msgstr "ülarelss"
@@ -19421,7 +19596,10 @@
 #. </rule>
 #.
+#. <!-- disused often appears together with highway=xy -->
+#. <!-- -> normal display with line, linemod for combinations -->
 #. <rule>
 #. <condition k="railway" v="disused"/>
 #. color oldrail
+#. color oldrail
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -19429,8 +19607,12 @@
 #. </rule>
 #.
+#. <!-- abandoned often appears together with highway=xy -->
+#. <!-- -> normal display with line, linemod for combinations -->
 #. <rule>
 #. <condition k="railway" v="abandoned"/>
-#: build/trans_style.java:1171 build/trans_style.java:1179
-#: build/trans_style.java:1187
+#. color oldrail
+#: build/trans_style.java:1176 build/trans_style.java:1186
+#: build/trans_style.java:1187 build/trans_style.java:1197
+#: build/trans_style.java:1198
 msgid "oldrail"
 msgstr "kasutamata raudtee"
@@ -19475,6 +19657,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1251 build/trans_style.java:1252
-#: build/trans_style.java:1284
+#: build/trans_style.java:1262 build/trans_style.java:1263
+#: build/trans_style.java:1295
 msgid "aeroway"
 msgstr "aeronautika"
@@ -19488,5 +19670,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1260
+#: build/trans_style.java:1271
 msgid "terminal"
 msgstr "lennuterminal"
@@ -19508,5 +19690,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1268 build/trans_style.java:1276
+#: build/trans_style.java:1279 build/trans_style.java:1287
 msgid "aeroway_dark"
 msgstr "helikopterid"
@@ -19520,5 +19702,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1292
+#: build/trans_style.java:1303
 msgid "aeroway_light"
 msgstr "kerglennukid"
@@ -19566,7 +19748,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: 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
+#: build/trans_style.java:1313 build/trans_style.java:1321
+#: build/trans_style.java:1329 build/trans_style.java:1337
+#: build/trans_style.java:1345
 msgid "aerialway"
 msgstr "trosstransport"
@@ -19583,5 +19765,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1344 build/trans_style.java:1345
+#: build/trans_style.java:1355 build/trans_style.java:1356
 msgid "piste_easy"
 msgstr "suusanõlv lihtne"
@@ -19596,5 +19778,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1353 build/trans_style.java:1354
+#: build/trans_style.java:1364 build/trans_style.java:1365
 msgid "piste_intermediate"
 msgstr "suusanõlv keskmine"
@@ -19609,5 +19791,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1362 build/trans_style.java:1363
+#: build/trans_style.java:1373 build/trans_style.java:1374
 msgid "piste_advanced"
 msgstr "suusanõlv edasijõudnutele"
@@ -19622,5 +19804,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1371 build/trans_style.java:1372
+#: build/trans_style.java:1382 build/trans_style.java:1383
 msgid "piste_expert"
 msgstr ""
@@ -19635,5 +19817,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1380 build/trans_style.java:1381
+#: build/trans_style.java:1391 build/trans_style.java:1392
 msgid "piste_freeride"
 msgstr "suusanõlv klassita"
@@ -19648,5 +19830,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1389 build/trans_style.java:1390
+#: build/trans_style.java:1400 build/trans_style.java:1401
 msgid "piste_novice"
 msgstr "suusanõlv algajale"
@@ -19751,10 +19933,10 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: 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
+#: build/trans_style.java:1412 build/trans_style.java:1419
+#: build/trans_style.java:1428 build/trans_style.java:1436
+#: build/trans_style.java:1444 build/trans_style.java:1452
+#: build/trans_style.java:1460 build/trans_style.java:1468
+#: build/trans_style.java:1476 build/trans_style.java:1484
+#: build/trans_style.java:1492 build/trans_style.java:1500
 msgid "power"
 msgstr "elektrivarustus"
@@ -19768,5 +19950,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1530 build/trans_style.java:1531
+#: build/trans_style.java:1541 build/trans_style.java:1542
 msgid "pier"
 msgstr "kai"
@@ -19780,5 +19962,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1539
+#: build/trans_style.java:1550
 msgid "pipeline"
 msgstr "torujuhe"
@@ -19906,12 +20088,12 @@
 #. <condition k="leisure" v="miniature_golf"/>
 #. <icon annotate="true" src="sport/golf.png"/>
-#: 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
+#: build/trans_style.java:1633 build/trans_style.java:1641
+#: build/trans_style.java:1649 build/trans_style.java:1657
+#: build/trans_style.java:1665 build/trans_style.java:1673
+#: build/trans_style.java:1689 build/trans_style.java:1697
+#: build/trans_style.java:1705 build/trans_style.java:1713
+#: build/trans_style.java:1721 build/trans_style.java:1729
+#: build/trans_style.java:1737 build/trans_style.java:1745
+#: build/trans_style.java:1753
 msgid "leisure"
 msgstr "puhkealad"
@@ -19925,5 +20107,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1670
+#: build/trans_style.java:1681
 msgid "marina"
 msgstr "paadisadam"
@@ -19995,8 +20177,8 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: 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
+#: build/trans_style.java:1763 build/trans_style.java:1771
+#: build/trans_style.java:1779 build/trans_style.java:1787
+#: build/trans_style.java:1795 build/trans_style.java:1803
+#: build/trans_style.java:1811 build/trans_style.java:1819
 msgid "amenity"
 msgstr "mugavused"
@@ -20098,10 +20280,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: 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
+#: build/trans_style.java:1827 build/trans_style.java:1835
+#: build/trans_style.java:1843 build/trans_style.java:1851
+#: build/trans_style.java:1859 build/trans_style.java:1867
+#: build/trans_style.java:1875 build/trans_style.java:1883
+#: build/trans_style.java:1891 build/trans_style.java:1898
+#: build/trans_style.java:1907 build/trans_style.java:1915
 msgid "amenity_traffic"
 msgstr "autohooldus"
@@ -20487,22 +20669,22 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png"/>
-#: 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
+#: build/trans_style.java:1923 build/trans_style.java:1931
+#: build/trans_style.java:1939 build/trans_style.java:1947
+#: build/trans_style.java:1955 build/trans_style.java:1963
+#: build/trans_style.java:1971 build/trans_style.java:1979
+#: build/trans_style.java:2094 build/trans_style.java:2102
+#: build/trans_style.java:2109 build/trans_style.java:2118
+#: build/trans_style.java:2126 build/trans_style.java:2134
+#: build/trans_style.java:2142 build/trans_style.java:2150
+#: build/trans_style.java:2158 build/trans_style.java:2166
+#: build/trans_style.java:2229 build/trans_style.java:2237
+#: build/trans_style.java:2245 build/trans_style.java:2254
+#: build/trans_style.java:2262 build/trans_style.java:2269
+#: build/trans_style.java:2277 build/trans_style.java:2285
+#: build/trans_style.java:2293 build/trans_style.java:2301
+#: build/trans_style.java:2309 build/trans_style.java:2317
+#: build/trans_style.java:2325 build/trans_style.java:2333
+#: build/trans_style.java:2341 build/trans_style.java:2349
+#: build/trans_style.java:2358 build/trans_style.java:2366
 msgid "amenity_light"
 msgstr "muud mugavused"
@@ -20534,6 +20716,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:3235
+#: build/trans_style.java:1987 build/trans_style.java:1995
+#: build/trans_style.java:3246
 msgid "light_water"
 msgstr "vesi"
@@ -20594,8 +20776,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: 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
+#: build/trans_style.java:2173 build/trans_style.java:2181
+#: build/trans_style.java:2189 build/trans_style.java:2198
+#: build/trans_style.java:2205 build/trans_style.java:2213
+#: build/trans_style.java:2221
 msgid "health"
 msgstr "tervishoid"
@@ -20948,26 +21130,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: 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
+#: build/trans_style.java:2385 build/trans_style.java:2393
+#: build/trans_style.java:2401 build/trans_style.java:2409
+#: build/trans_style.java:2417 build/trans_style.java:2425
+#: build/trans_style.java:2433 build/trans_style.java:2441
+#: build/trans_style.java:2449 build/trans_style.java:2457
+#: build/trans_style.java:2465 build/trans_style.java:2473
+#: build/trans_style.java:2481 build/trans_style.java:2489
+#: build/trans_style.java:2497 build/trans_style.java:2505
+#: build/trans_style.java:2513 build/trans_style.java:2521
+#: build/trans_style.java:2529 build/trans_style.java:2537
+#: build/trans_style.java:2545 build/trans_style.java:2553
+#: build/trans_style.java:2561 build/trans_style.java:2569
+#: build/trans_style.java:2577 build/trans_style.java:2585
+#: build/trans_style.java:2593 build/trans_style.java:2601
+#: build/trans_style.java:2609 build/trans_style.java:2617
+#: build/trans_style.java:2625 build/trans_style.java:2633
+#: build/trans_style.java:2641 build/trans_style.java:2649
+#: build/trans_style.java:2657 build/trans_style.java:2665
+#: build/trans_style.java:2673 build/trans_style.java:2681
+#: build/trans_style.java:2689 build/trans_style.java:2697
+#: build/trans_style.java:2705 build/trans_style.java:2713
+#: build/trans_style.java:2722
 msgid "shop"
 msgstr "pood"
@@ -21039,8 +21221,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: 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
+#: build/trans_style.java:2732 build/trans_style.java:2740
+#: build/trans_style.java:2748 build/trans_style.java:2756
+#: build/trans_style.java:2764 build/trans_style.java:2772
+#: build/trans_style.java:2780 build/trans_style.java:2788
 msgid "hotel"
 msgstr "hotell"
@@ -21190,9 +21372,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: 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
+#: build/trans_style.java:2796 build/trans_style.java:2804
+#: build/trans_style.java:2812 build/trans_style.java:2820
+#: build/trans_style.java:2828 build/trans_style.java:2836
+#: build/trans_style.java:2837 build/trans_style.java:2845
+#: build/trans_style.java:2861 build/trans_style.java:2932
 msgid "tourism"
 msgstr "turism"
@@ -21264,8 +21446,8 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
-#: 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
+#: build/trans_style.java:2942 build/trans_style.java:2950
+#: build/trans_style.java:2958 build/trans_style.java:2966
+#: build/trans_style.java:2974 build/trans_style.java:2982
+#: build/trans_style.java:2990 build/trans_style.java:2998
 msgid "historic"
 msgstr "alalooline"
@@ -21336,8 +21518,8 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: 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
+#: build/trans_style.java:3007 build/trans_style.java:3015
+#: build/trans_style.java:3023 build/trans_style.java:3031
+#: build/trans_style.java:3079 build/trans_style.java:3087
+#: build/trans_style.java:3185 build/trans_style.java:3193
 msgid "green"
 msgstr "roheline"
@@ -21351,5 +21533,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3028
+#: build/trans_style.java:3039
 msgid "quarry"
 msgstr "kivimurd"
@@ -21363,5 +21545,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3036
+#: build/trans_style.java:3047
 msgid "landfill"
 msgstr "prügimägi"
@@ -21383,5 +21565,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3044 build/trans_style.java:3052
+#: build/trans_style.java:3055 build/trans_style.java:3063
 msgid "basin"
 msgstr "tehisjärv"
@@ -21395,5 +21577,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3060
+#: build/trans_style.java:3071
 msgid "forest"
 msgstr "kultuurmets"
@@ -21407,5 +21589,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3092
+#: build/trans_style.java:3103
 msgid "farmyard"
 msgstr "taluõu"
@@ -21428,5 +21610,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3101 build/trans_style.java:3109
+#: build/trans_style.java:3112 build/trans_style.java:3120
 msgid "retail"
 msgstr "kaubandus"
@@ -21440,5 +21622,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3117
+#: build/trans_style.java:3128
 msgid "industrial"
 msgstr "tööstus"
@@ -21452,5 +21634,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3125
+#: build/trans_style.java:3136
 msgid "brownfield"
 msgstr "jäätmaa"
@@ -21464,5 +21646,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3133
+#: build/trans_style.java:3144
 msgid "greenfield"
 msgstr "rohepiirkond"
@@ -21476,5 +21658,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3141
+#: build/trans_style.java:3152
 msgid "railland"
 msgstr "raudteede piirkond"
@@ -21531,7 +21713,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: 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
+#: build/trans_style.java:3169 build/trans_style.java:3204
+#: build/trans_style.java:3212 build/trans_style.java:3220
+#: build/trans_style.java:3228 build/trans_style.java:3236
 msgid "military"
 msgstr "militaarala"
@@ -21545,5 +21727,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3166
+#: build/trans_style.java:3177
 msgid "cemetery"
 msgstr "kalmistu"
@@ -21556,5 +21738,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3242
+#: build/trans_style.java:3253
 msgid "peak"
 msgstr "mäetipp"
@@ -21569,5 +21751,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3251
+#: build/trans_style.java:3262
 msgid "glacier"
 msgstr "liustik"
@@ -21581,5 +21763,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3259
+#: build/trans_style.java:3270
 msgid "volcano"
 msgstr "vulkaan"
@@ -21634,8 +21816,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: 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
+#: build/trans_style.java:3278 build/trans_style.java:3279
+#: build/trans_style.java:3287 build/trans_style.java:3303
+#: build/trans_style.java:3376 build/trans_style.java:3384
+#: build/trans_style.java:3392
 msgid "natural"
 msgstr "looduslik"
@@ -21649,5 +21831,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3284
+#: build/trans_style.java:3295
 msgid "scrub"
 msgstr "põõsastik"
@@ -21661,5 +21843,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3300
+#: build/trans_style.java:3311
 msgid "heath"
 msgstr "nõmm"
@@ -21673,5 +21855,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3308
+#: build/trans_style.java:3319
 msgid "wood"
 msgstr "mets"
@@ -21685,5 +21867,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3349
+#: build/trans_style.java:3360
 msgid "mud"
 msgstr "muda"
@@ -21697,5 +21879,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3357
+#: build/trans_style.java:3368
 msgid "beach"
 msgstr "rand"
@@ -21773,8 +21955,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: 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
+#: build/trans_style.java:3408 build/trans_style.java:3416
+#: build/trans_style.java:3424 build/trans_style.java:3432
+#: build/trans_style.java:3440 build/trans_style.java:3448
+#: build/trans_style.java:3456 build/trans_style.java:3464
 msgid "route"
 msgstr "teekond"
@@ -21822,7 +22004,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: 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
+#: build/trans_style.java:3474 build/trans_style.java:3482
+#: build/trans_style.java:3490 build/trans_style.java:3498
+#: build/trans_style.java:3506
 msgid "boundary"
 msgstr "piir"
@@ -21964,10 +22146,10 @@
 #. <condition k="place" v="island"/>
 #. <icon annotate="true" src="place/island.png"/>
-#: 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
+#: build/trans_style.java:3930 build/trans_style.java:3938
+#: build/trans_style.java:3946 build/trans_style.java:3954
+#: build/trans_style.java:3962 build/trans_style.java:3970
+#: build/trans_style.java:3978 build/trans_style.java:3986
+#: build/trans_style.java:3994 build/trans_style.java:4002
+#: build/trans_style.java:4010 build/trans_style.java:4018
 msgid "place"
 msgstr "koht"
@@ -22015,6 +22197,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4124 build/trans_style.java:4131
-#: build/trans_style.java:4138 build/trans_style.java:4145
+#: build/trans_style.java:4135 build/trans_style.java:4142
+#: build/trans_style.java:4149 build/trans_style.java:4156
 msgid "address"
 msgstr "aadress"
@@ -22245,10 +22427,10 @@
 msgstr "Landsat"
 
-#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&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 "Open Aerial Map"
 
-#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&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
@@ -22256,5 +22438,5 @@
 msgstr "NPE Maps"
 
-#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe
+#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&
 #: build/trans_wms.java:9
 msgid "NPE Maps (Tim)"
@@ -22262,48 +22444,136 @@
 
 #. http://dev.openstreetmap.org/~timsc/wms2/map.php?
-#. different forms for Yahoo
-#. must be yahoo://<commandline>
-#. The {0} in the commandline is for the URL
-#. output must be on stdout
+#.
+#. different forms for web access
+#. must be html:<url>
+#: build/trans_wms.java:13
+msgid "Yahoo Sat"
+msgstr ""
+
+#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html?
 #: build/trans_wms.java:14
-msgid "YAHOO (GNOME)"
-msgstr "YAHOO (GNOME)"
-
-#. yahoo://gnome-web-photo --mode=photo --format=png {0} /dev/stdout
+#, fuzzy
+msgid "OpenStreetMap"
+msgstr "Openstreetmapi andmed"
+
+#. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html?
 #: build/trans_wms.java:15
-msgid "YAHOO (GNOME Fix)"
-msgstr "YAHOO (GNOME parandatud)"
-
-#. yahoo://gnome-web-photo-fixed {0}
+msgid "OpenCycleMap"
+msgstr ""
+
+#. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html?
 #: build/trans_wms.java:16
-msgid "YAHOO (WebKit)"
-msgstr "YAHOO (WebKit)"
-
-#. yahoo://webkit-image {0}
-#: build/trans_wms.java:17
-msgid "YAHOO (WebKit GTK)"
-msgstr "YAHOO (WebKit GTK)"
-
-#. yahoo://webkit-image-gtk {0}
+msgid "TilesAtHome"
+msgstr ""
+
+#. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
+#.
+#.
 #. only for Germany
-#: build/trans_wms.java:19
-msgid "Oberpfalz Geofabrik.de"
-msgstr "Oberpfalz Geofabrik.de"
-
-#. http://oberpfalz.geofabrik.de/wms4josm?
 #: build/trans_wms.java:20
 msgid "Streets NRW Geofabrik.de"
 msgstr "Tänavad NRW Geofabrik.de"
 
-#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms
-#. Terraserver USCG- High resolution maps
+#. 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
+#. 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 "Data Layer"
+#~ msgstr "Andmekiht"
+
+#~ msgid "Change"
+#~ msgstr "Muuda"
+
+#~ msgid "Conflicts: {0}"
+#~ msgstr "Konfliktid: {0}"
+
+#~ msgid "YAHOO (GNOME)"
+#~ msgstr "YAHOO (GNOME)"
+
+#~ msgid "YAHOO (GNOME Fix)"
+#~ msgstr "YAHOO (GNOME parandatud)"
+
+#~ msgid "YAHOO (WebKit)"
+#~ msgstr "YAHOO (WebKit)"
+
+#~ msgid "YAHOO (WebKit GTK)"
+#~ msgstr "YAHOO (WebKit GTK)"
+
+#~ msgid "Oberpfalz Geofabrik.de"
+#~ msgstr "Oberpfalz Geofabrik.de"
+
+#~ msgid "Uploading data"
+#~ msgstr "Andmete üles laadimine"
+
+#~ msgid "Not implemented yet."
+#~ msgstr "Pole veel teostatud."
+
+#~ msgid "Email"
+#~ msgstr "E-post"
+
+#~ msgid "Resolve Conflicts"
+#~ msgstr "Lahenda konfliktid"
+
+#~ msgid "Object"
+#~ msgstr "Objekt"
+
+#~ msgid "my version:"
+#~ msgstr "minu versioon:"
+
+#~ msgid "their version:"
+#~ msgstr "nende versioon:"
+
+#~ msgid "OSM username (email)"
+#~ msgstr "OSM kasutajanimi (email)"
+
+#~ msgid "Unknown host"
+#~ msgstr "Tundmatu host"
+
+#~ msgid "Click Reload to refresh list"
+#~ msgstr "Vajuta \"Lae uuesti\" et nimekirja uuendada"
+
+#~ msgid "Revert"
+#~ msgstr "Taasta"
+
+#~ msgid "Date"
+#~ msgstr "Kuupäev"
+
+#~ msgid ""
+#~ "Revert the state of all currently selected objects to the version "
+#~ "selected in the history list."
+#~ msgstr ""
+#~ "Taasta kõigi hetkel valitud objektide olek ajaloo nimekirjas valitud "
+#~ "versiooniks."
+
+#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
+#~ msgstr ""
+#~ "Saad kasutada hiirt või Ctrl+Nooleklahvid/./ et suurendada ja lohistada"
+
+#~ msgid ""
+#~ "Server returned internal error. Try a reduced area or retry after waiting "
+#~ "some time."
+#~ msgstr ""
+#~ "Server andis sisemise vea. Vähendage pindala või proovige mõne aja pärast "
+#~ "uuesti ."
+
+#~ msgid "Could not download plugin: {0} from {1}"
+#~ msgstr "Ei saa pistikut alla laadida: {0} kohast: {1}"
+
+#~ msgid ""
+#~ "The plugin {0} seems to be broken or could not be downloaded "
+#~ "automatically."
+#~ msgstr ""
+#~ "Plugin {0} paistab olevat vigane või seda ei saa automaatselt alla "
+#~ "laadida."
+
+#~ msgid "The projection could not be read from preferences. Using EPSG:4326"
+#~ msgstr "Ei saanud seadetest projektsiooni lugeda. Kasutan EPSG:4326"
 
 #~ msgid ""
@@ -22314,49 +22584,4 @@
 #~ "laetud elementidel on ajalugu."
 
-#~ msgid "Uploading data"
-#~ msgstr "Andmete üles laadimine"
-
-#~ msgid "Email"
-#~ msgstr "E-post"
-
-#~ msgid "Resolve Conflicts"
-#~ msgstr "Lahenda konfliktid"
-
-#~ msgid "my version:"
-#~ msgstr "minu versioon:"
-
-#~ msgid "their version:"
-#~ msgstr "nende versioon:"
-
-#~ msgid "OSM username (email)"
-#~ msgstr "OSM kasutajanimi (email)"
-
-#~ msgid "Unknown host"
-#~ msgstr "Tundmatu host"
-
-#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
-#~ msgstr ""
-#~ "Saad kasutada hiirt või Ctrl+Nooleklahvid/./ et suurendada ja lohistada"
-
-#~ msgid ""
-#~ "Server returned internal error. Try a reduced area or retry after waiting "
-#~ "some time."
-#~ msgstr ""
-#~ "Server andis sisemise vea. Vähendage pindala või proovige mõne aja pärast "
-#~ "uuesti ."
-
-#~ msgid "Could not download plugin: {0} from {1}"
-#~ msgstr "Ei saa pistikut alla laadida: {0} kohast: {1}"
-
-#~ msgid ""
-#~ "The plugin {0} seems to be broken or could not be downloaded "
-#~ "automatically."
-#~ msgstr ""
-#~ "Plugin {0} paistab olevat vigane või seda ei saa automaatselt alla "
-#~ "laadida."
-
-#~ msgid "The projection could not be read from preferences. Using EPSG:4326"
-#~ msgstr "Ei saanud seadetest projektsiooni lugeda. Kasutan EPSG:4326"
-
 #~ msgid ""
 #~ "This action will require {0} individual download requests. Do you wish to "
