Index: applications/editors/josm/i18n/po/et.po
===================================================================
--- applications/editors/josm/i18n/po/et.po	(revision 15910)
+++ applications/editors/josm/i18n/po/et.po	(revision 16009)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-14 16:51+0200\n"
+"POT-Creation-Date: 2009-06-19 21:52+0200\n"
 "PO-Revision-Date: 2009-06-07 16:39+0000\n"
 "Last-Translator: Margus Värton <margus@dakar.ee>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-06-14 14:47+0000\n"
+"X-Launchpad-Export-Date: 2009-06-19 19:34+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -27,11 +27,11 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:198
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:152
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:299
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:154
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:302
 msgid "Help"
 msgstr "Abi"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:261
-msgid "The projection could not be read from preferences. Using Mercartor"
+msgid "The projection could not be read from preferences. Using Mercator"
 msgstr "Projektsioon ei olnud eelistustest loetav. Kasutan Mercatori."
 
@@ -70,6 +70,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:79
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:130
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:341
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:312
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:356
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149
@@ -86,8 +88,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97
+#: ../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:129
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:120
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:86
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559
@@ -136,5 +138,5 @@
 #: ../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:157
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:158
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
@@ -532,5 +534,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:82
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
 #, java-format
 msgid "File: {0}"
@@ -600,6 +602,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:92
-msgid "Email"
-msgstr "E-post"
+msgid "E-Mail"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:96
@@ -637,12 +639,14 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:540
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:544
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:55
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:556
+#: ../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:556
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:559
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:563
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:339
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
@@ -669,5 +673,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:147
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:149
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56
@@ -700,15 +704,13 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:207
 #, java-format
-msgid "Helppage missing. Create it in <A HREF=\"{0}\">english</A>."
-msgstr "Abileht puudub. Loo see <A HREF=\"{0}\">english</A>."
+msgid "Help page missing. Create it in <A HREF=\"{0}\">english</A>."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:212
 #, java-format
 msgid ""
-"Helppage missing. Create it in <A HREF=\"{0}\">english</A> or <A HREF=\"{1}"
+"Help page missing. Create it in <A HREF=\"{0}\">english</A> or <A HREF=\"{1}"
 "\">your language</A>."
 msgstr ""
-"Abileht puudub. Loo see <A HREF=\"{0}\">english</A> või <A HREF=\"{1}"
-"\">eesti</A>"
 
 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:26
@@ -1134,13 +1136,13 @@
 msgstr "Abi: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:99
 msgid "Status Report"
 msgstr "Staatus"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:93
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:100
 msgid "Copy to clipboard and close"
 msgstr "Kopeeri puhvrisse ja sulge."
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:93
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:100
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:207
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:871
@@ -1341,16 +1343,14 @@
 msgstr "Tühista kõik valikud (page)"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:22
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:26
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:25
 msgid "Update Data"
 msgstr "Uuenda andmed"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23
 msgid "Updates the current data layer from the server (re-downloads data)"
 msgstr "Uuendab praeguse andmekihi serverist (laadib uuesti)."
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:63
 msgid ""
 "No data to update found. Have you already opened or downloaded a data layer?"
@@ -1359,86 +1359,258 @@
 "laaditud?"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:70
+msgid "Undeleting Way..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:133
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:247
+msgid "Yes, undelete them too"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:248
+msgid "No, cancel operation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:138
 #, java-format
 msgid ""
-"This action will require {0} individual download requests. Do you wish to "
-"continue?"
-msgstr "See nõuab {0} allalaadimise palvet. Soovid jätkata?"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:82
+"<html>There are {0} additional nodes used by way {1}<br>which are deleted on "
+"the server.<br><br>Do you want to undelete these nodes too?</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:143
+msgid "Undelete additional nodes?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:170
+#, java-format
+msgid "Checking whether node {0} is gone ..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:203
+msgid "Undeleting relation..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:252
+#, java-format
+msgid ""
+"<html>There are {0} additional primitives referred to by relation {1}"
+"<br>which are deleted on the server.<br><br>Do you want to undelete them too?"
+"</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:257
+msgid "Undelete dependent primitives?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:284
+#, java-format
+msgid "Checking whether primitive {0} is gone ..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:339
+msgid "Keep mine"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:340
+msgid "Delete mine"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:344
+#, java-format
+msgid ""
+"<html>The OSM primitive with id <strong>{0}</strong> has been deleted<br>on "
+"the server by another mapper.<br><br>Click <strong>{1}</strong> to keep your "
+"primitive and ignore the deleted state.<br>Your primitive will be assigend a "
+"new id.<br>Click <strong>{2}</strong> to accept the state on the server and "
+"to delete your primitive.<br>Click <strong>{3}</strong> to cancel.<br>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:356
+msgid "Primitive deleted on the server"
+msgstr ""
+
+#. should not happen
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:370
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:344
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:383
+#, java-format
+msgid "unexpected return value. Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:395
+msgid "Failed to update the selected primitives."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:396
+msgid "Update failed"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:408
+#, java-format
+msgid "Could not find primitive with id {0} in the current dataset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:409
+msgid "Missing primitive"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:441
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:445
+msgid "Update Selection"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:443
+msgid "Updates the currently selected primitives from the server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:457
+msgid "There are no selected primitives to update."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:458
+msgid "Selection empty"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:471
+#, java-format
+msgid ""
+"<html>There are  <strong>{0}</strong> primitives <br>selected for individual "
+"update. Please reduce the selection<br>to max. {1} primitives.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:476
+msgid "Selection too big"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
 msgid "Upload to OSM..."
 msgstr "Lae OSMi serverisse"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:79
 msgid "Upload all changes to the OSM server."
 msgstr "Lae kõik muudatused OSM serverisse üles."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:96
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:94
 msgid "Objects to add:"
 msgstr "Objektid lisada:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102
 msgid "Objects to modify:"
 msgstr "Objektid muuta:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:110
 msgid "Objects to delete:"
 msgstr "Objektid kustutada:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
 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:128
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:126
 msgid "Upload these changes?"
 msgstr "Kas laen need muudatused üles?"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:130
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
 msgid "Upload Changes"
 msgstr "Lae muudatused üles"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:152
 msgid "Nothing to upload. Get some data first."
 msgstr "Midagi pole üles laadida. Hangi esmalt andmeid."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
 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:182
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:180
 msgid "No changes to upload."
 msgstr "Pole muudatusi mida üles laadida."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:203
 msgid "Uploading"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:250
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
+msgid "Updating primitive"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:310
+#, java-format
+msgid "Synchronize {0} {1} only"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:355
+msgid "Synchronize entire dataset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:315
 #, java-format
 msgid ""
 "<html>Uploading <strong>failed</strong> because the server has a newer "
-"version of one<br>of your nodes, ways or relations.<br>The conflict is "
+"version of one<br>of your nodes, ways, or relations.<br>The conflict is "
 "caused by the <strong>{0}</strong> with id <strong>{1}</strong>,<br>the "
-"server has version {2}, your version is {3}.<br>Please synchronize your "
-"local dataset using <br><strong>File-&gt;Update Data</strong>, "
-"resolve<br>any conflicts and try to upload again.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:260
+"server has version {2}, your version is {3}.<br><br>Click <strong>{4}</"
+"strong> to synchronize the conflicting primitive only.<br>Click <strong>{5}</"
+"strong> to synchronize the entire local dataset with the server.<br>Click "
+"<strong>{6}</strong> to abort and continue editing.<br></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:330
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:370
+msgid "Conflict detected"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:359
+#, java-format
 msgid ""
-"<html>Uploading failed because the server has a newer version of one<br>of "
-"your nodes, ways or relations.<br>Please synchronize your local dataset "
-"using <br><strong>File-&gt;Update Data</strong>, resolve<br>any conflicts "
-"and try to upload again.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:270
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:279
+"<html>Uploading <strong>failed</strong> because the server has a newer "
+"version of one<br>of your nodes, ways, or relations.<br><br>Click <strong>{0}"
+"</strong> to synchronize the entire local dataset with the server.<br>Click "
+"<strong>{1}</strong> to abort and continue editing.<br></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:399
+#, java-format
+msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:412
+#, java-format
+msgid ""
+"<html>Uploading to the server <strong>failed</strong> because your "
+"current<br>dataset violates a precondition.<br>The error message is:<br>{0}</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:419
+msgid "Precondition violation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:452
+#, java-format
+msgid ""
+"<html>Uploading <strong>failed</strong> because a primitive you tried "
+"to<br>delete on the server is already deleted.<br><br>The error message is:"
+"<br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:463
+msgid "Primitive already deleted"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:484
+#, java-format
+msgid "Error header \"{0}\" doesn't match expected pattern \"{1}\""
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:539
 msgid "Upload to OSM API failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:287
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:51
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:552
 #, java-format
 msgid ""
@@ -1543,37 +1715,51 @@
 msgstr "Toored GPS andmed"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:44
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:46
 msgid "Downloading data"
 msgstr "Andmete allalaadimine"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:62
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:64
 msgid "No data imported."
 msgstr "Andmeid ei imporditud."
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:68
+#: ../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:83
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:88
 msgid "OpenStreetMap data"
 msgstr "Openstreetmapi andmed"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:37
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:45
 msgid "Data Layer"
 msgstr "Andmekiht"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:47
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:55
 #, java-format
 msgid "Download {0} of {1} ({2} left)"
 msgstr "Laen alla {0} {1}-st ({2} veel)"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:88
-msgid "The following errors occured during mass download:"
-msgstr "Mass-allalaadimisel leidsid aset järgmised vead:"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:89
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:95
+msgid "The following errors occurred during mass download:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:96
 msgid "Errors during Download"
 msgstr "Viga allaladimise ajal"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:135
+#, java-format
+msgid ""
+"<html>There are {0} primitives in your local dataset which<br>might be "
+"deleted on the server. If you later try to delete or<br>update them on the "
+"server the server is likely to report a<br>conflict.<br><br>Click <strong>{1}"
+"</strong> to check these primitives individually.<br>Click <strong>{2}</"
+"strong> to ignore.<br></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:150
+msgid "Deleted or moved primitives"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:45
@@ -1624,34 +1810,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:495
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:493
 msgid "Add node"
 msgstr "Lisa punkt"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:497
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:495
 msgid "Add node into way"
 msgstr "Lisa teele sõlm"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:502
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:500
 msgid "Connect existing way to node"
 msgstr "Ühenda olemasolev tee sõlmega"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:504
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:502
 msgid "Add a new node to an existing way"
 msgstr "Ühenda uus sõlm olemasoleva teega"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:506
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:504
 msgid "Add node into way and connect"
 msgstr "Lisa sõlm teele ja ühenda"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:883
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:881
 msgid "Create new node."
 msgstr "Loo uus sõlm."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:888
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:910
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:886
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:908
 msgid "Select node under cursor."
 msgstr "Vali kursori all olev sõlm."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:888
 #, java-format
 msgid "Insert new node into way."
@@ -1660,14 +1846,14 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:899
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:897
 msgid "Start new way from last node."
 msgstr "Alusta uut teed viimasest sõlmest."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:901
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:899
 msgid "Continue way from last node."
 msgstr "Jätke teed viimasest sõlmest."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:922
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:910
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:920
 msgid "Finish drawing."
 msgstr "Lõpeta joonistamine."
@@ -1976,25 +2162,31 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:33
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:34
 msgid "Load Selection"
 msgstr "Lae valik"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:40
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:41
 #, java-format
 msgid "Contact {0}..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:45
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:46
 msgid "Downloading..."
 msgstr "Allalaadimine..."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:57
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:59
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:67
 #, java-format
 msgid "Could not read from URL: \"{0}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:60
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:62
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:70
 #, java-format
 msgid "Parsing error in URL: \"{0}\""
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:74
+msgid "Error while communicating with server."
 msgstr ""
 
@@ -2056,13 +2248,78 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:44
+#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:54
+#, java-format
+msgid "Resolve conflicts in coordinates in {0}"
+msgstr ""
+
+#. should not happen
+#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:74
+#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:73
+msgid "cannot resolve undecided conflict"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81
+#, java-format
+msgid "Delete {1} {0}"
+msgstr "Kustuta {1} {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97
+#, 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
+msgid "Conflicting relation"
+msgstr "Konfliktne relatsioon"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147
+#, java-format
+msgid ""
+"Selection \"{0}\" is used by relation \"{1}\" with role {2}.\n"
+"Delete from relation?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570
+msgid "Delete from relation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
+#, java-format
+msgid ""
+"Selection \"{0}\" is used by relation \"{1}\".\n"
+"Delete from relation?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:366
+msgid "Split way segment"
+msgstr ""
+
+#. leave message in one tr() as there is a grammatical connection.
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:385
+msgid ""
+"You are about to delete nodes outside of the area you have downloaded."
+"<br>This can cause problems because other objects (that you don't see) might "
+"use them.<br>Do you really want to delete?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:53
+#, java-format
+msgid "Resolve conflicts in deleted state in {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118
+msgid "Move"
+msgstr "Liiguta"
+
 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118
 #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
-#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:60
-#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:47
 #: ../core/src/org/openstreetmap/josm/data/osm/Node.java:112
+#: ../core/src/org/openstreetmap/josm/data/osm/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:216
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:223
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483
 msgid "node"
@@ -2071,10 +2328,217 @@
 msgstr[1] "punktid"
 
-#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:45
-#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:61
-#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:48
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:157
+msgid "Purging 1 primitive"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:188
+#, java-format
+msgid ""
+"Warning: Purging way {0} because number of nodes dropped below 2. Current is "
+"{1}"
+msgstr ""
+
+#: ../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 "Sequence"
+msgstr "Jada"
+
+#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:72
+#, java-format
+msgid "Resolve {0} tag conflicts in {1} {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:61
+#, java-format
+msgid "Undelete {0} primitives"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:44
+#, java-format
+msgid "Resolve version conflicts for {0} {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52
+#, java-format
+msgid "Resolve conflicts in node list of of way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
+msgid "Apply?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:141
+msgid ""
+"When reversing this way, the following changes to properties of the way and "
+"its nodes are suggested in order to maintain data consistency."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28
+msgid "Relation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30
+msgid "Old role"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:32
+msgid "New role"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
+msgid "Old key"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
+msgid "Old value"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
+msgid "New key"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
+msgid "New value"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:40
+msgid "Apply selected changes"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41
+msgid "Don't apply changes"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:83
+msgid "Please select which property changes you want to apply."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:96
+msgid "Properties of "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:120
+msgid "Roles in relations referring to"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:136
+msgid "Automatic tag correction"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:314
+#, java-format
+msgid "Malformed config file at lines {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:324
+#, java-format
+msgid "Cannot open preferences directory: {0}"
+msgstr "Ei suuda avada eelistuste kataloogi: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:342
+#, java-format
+msgid "Preferences file had errors. Making backup of old one to {0}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:79
+#, java-format
+msgid "Preferences stored on {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:82
+#, java-format
+msgid "Could not upload preferences. Reason: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:93
+msgid "Could not load preferences from server."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:34
+msgid "different"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:262
+msgid "deleted"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
+msgid "true"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
+msgid "false"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20
+msgid "position"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30
+msgid "Decimal Degrees"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
+msgid "Degrees Minutes Seconds"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+msgid "S"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+msgid "N"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+msgid "W"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+msgid "E"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:287
+#, java-format
+msgid "parameter {0} > 0 required. Got {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:108
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:84
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:115
+msgid "incomplete"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
+#, java-format
+msgid "Error: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
+#, java-format
+msgid "Warning: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7
+msgid "nodes"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:8
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:217
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:224
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483
 msgid "way"
@@ -2083,8 +2547,10 @@
 msgstr[1] "teed"
 
-#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:46
-#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:62
-#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:49
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:87
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:8
+msgid "ways"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:88
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:69
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
@@ -2095,256 +2561,27 @@
 msgstr[1] "seosed"
 
-#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:68
-#, java-format
-msgid "Resolve conflicts in coordinates in {0}"
-msgstr ""
-
-#. should not happen
-#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:88
-#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:73
-msgid "cannot resolve undecided conflict"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81
-#, java-format
-msgid "Delete {1} {0}"
-msgstr "Kustuta {1} {0}"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97
-#, 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
-msgid "Conflicting relation"
-msgstr "Konfliktne relatsioon"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147
-#, java-format
-msgid ""
-"Selection \"{0}\" is used by relation \"{1}\" with role {2}.\n"
-"Delete from relation?"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570
-msgid "Delete from relation"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
-#, java-format
-msgid ""
-"Selection \"{0}\" is used by relation \"{1}\".\n"
-"Delete from relation?"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:366
-msgid "Split way segment"
-msgstr ""
-
-#. leave message in one tr() as there is a grammatical connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:385
-msgid ""
-"You are about to delete nodes outside of the area you have downloaded."
-"<br>This can cause problems because other objects (that you don't see) might "
-"use them.<br>Do you really want to delete?"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:53
-#, java-format
-msgid "Resolve conflicts in deleted state in {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118
-msgid "Move"
-msgstr "Liiguta"
-
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:52
-#, java-format
-msgid "Resolve conflicts in member list of of relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66
-msgid "RemoveRelationMember"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
-msgid "Rotate"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88
-msgid "Sequence"
-msgstr "Jada"
-
-#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:84
-#, java-format
-msgid "Resolve {0} tag conflicts in {1} {2}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:57
-#, java-format
-msgid "Resolve version conflicts for {0} {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52
-#, java-format
-msgid "Resolve conflicts in node list of of way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
-msgid "Apply?"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:141
-msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28
-msgid "Relation"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30
-msgid "Old role"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:32
-msgid "New role"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
-msgid "Old key"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
-msgid "Old value"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
-msgid "New key"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
-msgid "New value"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:40
-msgid "Apply selected changes"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41
-msgid "Don't apply changes"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:83
-msgid "Please select which property changes you want to apply."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:96
-msgid "Properties of "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:120
-msgid "Roles in relations referring to"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:136
-msgid "Automatic tag correction"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:314
-#, java-format
-msgid "Malformed config file at lines {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:324
-#, java-format
-msgid "Cannot open preferences directory: {0}"
-msgstr "Ei suuda avada eelistuste kataloogi: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:342
-#, java-format
-msgid "Preferences file had errors. Making backup of old one to {0}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:79
-#, java-format
-msgid "Preferences stored on {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:82
-#, java-format
-msgid "Could not upload preferences. Reason: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:93
-msgid "Could not load preferences from server."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:34
-msgid "different"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:262
-msgid "deleted"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
-msgid "true"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
-msgid "false"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20
-msgid "position"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30
-msgid "Decimal Degrees"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
-msgid "Degrees Minutes Seconds"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
-msgid "S"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
-msgid "N"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
-msgid "W"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
-msgid "E"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:108
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:83
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:115
-msgid "incomplete"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
-#, java-format
-msgid "Error: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
-#, java-format
-msgid "Warning: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:101
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9
+msgid "relations"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10
+msgid "changeset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10
+msgid "changesets"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:38
+#, java-format
+msgid "parameter ''{0}'' is not a valid type name, got ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:50
+#, java-format
+msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:107
 #, java-format
 msgid "{0} member"
@@ -2358,5 +2595,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:122
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "railway"
 msgstr ""
@@ -2378,4 +2615,62 @@
 msgstr[1] "{0} punkti"
 
+#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:153
+msgid "There's no primitive with version {0} in this history"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:160
+#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:162
+msgid "There's no version valid at date ''{0}'' in this history"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:173
+#, java-format
+msgid "parameter ''{0}'' in range 0..{1} expected, got {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:179
+msgid "no earliest version found. History is empty."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:185
+msgid "no latest version found. History is empty."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:21
+msgid "Didn't find an  primitive with id {0} in this dataset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:27
+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/RelationMember.java:33
+#, java-format
+msgid "parameter ''{0}'' > 0 expected, got ''{1}''"
+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/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
+msgid "can't compare primitive with id ''{0}'' to primitive with id ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:89
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java:48
+#, java-format
+msgid "parameter {0} not in range 0..{1}, got {2}"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:234
 msgid "Area style way is not closed."
@@ -2523,5 +2818,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:231
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:144
 msgid "background"
 msgstr "taust"
@@ -2594,8 +2889,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:135
+#: ../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:210
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:218
 #: ../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
@@ -2607,7 +2902,7 @@
 #: ../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:135
+#: ../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:214
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78
@@ -2714,10 +3009,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:85
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:81
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:75
 msgid "Username"
 msgstr "Kasutajanimi"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:84
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:78
 msgid "Password"
 msgstr "Salasõna"
@@ -2811,22 +3106,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:146
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148
 msgid "File"
 msgstr "Fail"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150
 msgid "View"
 msgstr "Vaade"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:149
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151
 msgid "Tools"
 msgstr "Tööriistad"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:152
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
 msgid "Presets"
 msgstr "Eelseaded"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
@@ -2839,21 +3134,21 @@
 
 #. TODO move code to an "action" like the others?
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:216
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:219
 msgid "Wireframe View"
 msgstr "Joonvõrgu vaade"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:218
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221
 msgid "Toggle Wireframe view"
 msgstr "Lülita joonvõrgu vaade"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:244
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:247
 msgid "Full Screen"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:246
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:249
 msgid "Toggle Full Screen view"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:286
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:289
 msgid "Audio"
 msgstr "Heli"
@@ -2925,6 +3220,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:236
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:250
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:239
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:254
 msgid "layer not in list."
 msgstr "kiht ei ole nimekirjas"
@@ -2934,9 +3229,9 @@
 msgstr "Ühendun OSM serveriga"
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:104
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:105
 msgid "Error while parsing"
 msgstr "Viga parsimisel"
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:107
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:108
 msgid "File not found"
 msgstr ""
@@ -3008,5 +3303,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:78
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:158
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:203
 msgid "Members"
 msgstr "Liikmed"
@@ -3202,5 +3497,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:266
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179
@@ -3282,5 +3577,5 @@
 #: ../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/io/OsmApi.java:140
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133
 msgid "parameter '{0}' must not be null"
 msgstr ""
@@ -3319,5 +3614,5 @@
 msgid ""
 "Properties in the merged element. They will replace properties in my "
-"elements when  merge decisions are applied."
+"elements when merge decisions are applied."
 msgstr ""
 
@@ -3371,5 +3666,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
 msgid "Role"
 msgstr "Roll"
@@ -3473,5 +3768,5 @@
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:69
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
@@ -3783,5 +4078,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:78
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:130
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2959
 msgid "Relations"
 msgstr "Seosed"
@@ -3887,66 +4182,66 @@
 
 #. We need this twice, so cache result
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:96
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:98
 #: ../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:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:116
 msgid "Basic"
 msgstr "Lihtne"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
 msgid "Occupied By"
 msgstr "Kasutab"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
 msgid "linked"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:201
 msgid "Tags (empty value deletes tag)"
 msgstr "Sildid (tühi väärtus kustutab sildi)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240
 msgid "Move Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240
 msgid "Move the currently selected members up"
 msgstr "Liiguta hetkel valitud liiget ülespoole"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:246
 msgid "Add Selected"
 msgstr "Lisa valitud"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:241
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:247
 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:247
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:253
 msgid "Remove Selected"
 msgstr "Eemalda valitud"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:248
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:254
 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:254
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
 msgid "Move Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:254
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
 msgid "Move the currently selected members down"
 msgstr "Liiguta hetkel valitud liiget allapoole"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:267
 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:274
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:280
 msgid "Download Members"
 msgstr "Lae alla liikmed"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:275
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:281
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Lae alla kõik sellest seosest puudu olevad teed ja puntid"
@@ -3991,5 +4286,5 @@
 #. item "Amenities/Toilets" combo "Fee"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:408
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:418
 #: build/trans_presets.java:312 build/trans_presets.java:313
 #: build/trans_presets.java:314 build/trans_presets.java:315
@@ -4010,9 +4305,9 @@
 #: build/trans_presets.java:639 build/trans_presets.java:640
 #: build/trans_presets.java:641 build/trans_presets.java:1368
-#: build/trans_presets.java:2308 build/trans_presets.java:2572
+#: build/trans_presets.java:2309 build/trans_presets.java:2573
 msgid "yes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:408
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:418
 #: build/trans_presets.java:312 build/trans_presets.java:313
 #: build/trans_presets.java:314 build/trans_presets.java:315
@@ -4034,31 +4329,34 @@
 #: 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:2308
-#: build/trans_presets.java:2572
+#: 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:413
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:423
 #, java-format
 msgid "Members: {0}"
 msgstr "Liikmed: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:421
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:431
 #, java-format
 msgid "Relation Editor: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:531
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:545
 msgid "There were conflicts during import."
 msgstr "Importimisel tekkisid konfliktid."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:539
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:555
 msgid "Error parsing server response."
 msgstr "Viga serveri vastuse töötlemisel."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:543
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:558
 msgid "Cannot connect to server."
 msgstr "Ei saa serveriga ühenduda."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:562
+msgid "Error when communicating with server."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:67
@@ -4123,17 +4421,17 @@
 msgstr "Andme allikad ja tüübid"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:171
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:170
 msgid "Download as new layer"
 msgstr "Lae alla uue kihina"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:174
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:173
 msgid "Download Area"
 msgstr "Allalaetav ala"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:223
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:222
 msgid "Download area too large; will probably be rejected by server"
 msgstr "Allalaetav ala liiga suur; server arvatavasti keeldub"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:226
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:225
 msgid "Download area ok, size probably acceptable to server"
 msgstr "Allalaetav ala paras, suurus serverile tõenäoliselt sobiv"
@@ -4161,5 +4459,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:218
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2604
 msgid "Places"
 msgstr "Asukohad"
@@ -4206,21 +4504,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:236
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:242
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1890
-#: build/trans_presets.java:1896 build/trans_presets.java:1902
-#: build/trans_presets.java:1908 build/trans_presets.java:1914
-#: build/trans_presets.java:1920 build/trans_presets.java:1929
-#: build/trans_presets.java:1936 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
-#: build/trans_presets.java:2010 build/trans_presets.java:2016
-#: build/trans_presets.java:2022 build/trans_presets.java:2028
-#: build/trans_presets.java:2034 build/trans_presets.java:2040
+#: 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 "type"
 msgstr "tüüp"
@@ -4260,15 +4558,4 @@
 msgid "Tile Numbers"
 msgstr "Pildi numbrid"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/WorldChooser.java:103
-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"
-
-#. item "Tourism/Information Office" text "Opening Hours"
-#: ../core/src/org/openstreetmap/josm/gui/download/WorldChooser.java:104
-#: build/trans_presets.java:1674
-msgid "Map"
-msgstr "Kaart"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:98
@@ -4347,5 +4634,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:443
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:240
+#: ../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)"
@@ -4461,14 +4748,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:205
+#: ../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:227
+#: ../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:297
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314
 #, java-format
 msgid "{0} track, "
@@ -4477,5 +4764,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:298
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315
 #, java-format
 msgid "{0} route, "
@@ -4484,5 +4771,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:299
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
 #, java-format
 msgid "{0} waypoint"
@@ -4491,28 +4778,28 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:303
+#: ../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:306
+#: ../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:330
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347
 msgid "Timespan: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354
 msgid "Length: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:656
+#: ../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:660
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
 msgid ""
@@ -4523,11 +4810,11 @@
 "kahjulikuks. <br> Kui soovite üles laadida radasid, vaata siia:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:661
+#: ../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:681
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:466
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:698
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
@@ -4537,29 +4824,29 @@
 msgstr "Muudetud sellest: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:697
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:718
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809
+#: ../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:704
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721
 msgid "Download everything within:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:707
+#: ../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:710
+#: ../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:713
+#: ../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:805
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:822
 #, java-format
 msgid ""
@@ -4568,9 +4855,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:879
+#: ../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:1026
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1043
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -4578,5 +4865,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1030
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1047
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -4584,33 +4871,42 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:142
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:148
 msgid "outside downloaded area"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:218
+#: ../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:364
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:268
+msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:280
+#, java-format
+msgid "There were {0} conflicts during import."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:388
 #, java-format
 msgid "{0} consists of:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:392
 #, java-format
 msgid " ({0} deleted.)"
 msgstr " ({0} kustutatud.)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:371
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:396
 msgid "unset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:371
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:396
 #, java-format
 msgid "API version: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:463
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:492
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
 msgid "Convert to GPX layer"
@@ -4618,21 +4914,21 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1890
-#: build/trans_presets.java:1896 build/trans_presets.java:1902
-#: build/trans_presets.java:1908 build/trans_presets.java:1914
-#: build/trans_presets.java:1920 build/trans_presets.java:1929
-#: build/trans_presets.java:1936 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
-#: build/trans_presets.java:2010 build/trans_presets.java:2016
-#: build/trans_presets.java:2022 build/trans_presets.java:2028
-#: build/trans_presets.java:2034 build/trans_presets.java:2040
+#: 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"
@@ -4776,5 +5072,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:187
+#: ../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
@@ -4783,5 +5079,5 @@
 msgstr "PAlun vali rida muutmiseks"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:198
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
 #, java-format
@@ -4789,5 +5085,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:199
+#: ../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
@@ -4797,5 +5093,5 @@
 msgstr "Palun vali rida kustutamiseks"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:216
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:224
 msgid "Enter a new key/value pair"
 msgstr ""
@@ -5672,106 +5968,106 @@
 #: build/trans_presets.java:1447 build/trans_presets.java:1457
 #: build/trans_presets.java:1477 build/trans_presets.java:1489
-#: build/trans_presets.java:1500 build/trans_presets.java:1516
-#: build/trans_presets.java:1523 build/trans_presets.java:1538
-#: build/trans_presets.java:1545 build/trans_presets.java:1550
-#: build/trans_presets.java:1556 build/trans_presets.java:1562
-#: build/trans_presets.java:1567 build/trans_presets.java:1573
-#: build/trans_presets.java:1579 build/trans_presets.java:1587
-#: build/trans_presets.java:1594 build/trans_presets.java:1601
-#: build/trans_presets.java:1607 build/trans_presets.java:1612
-#: build/trans_presets.java:1618 build/trans_presets.java:1624
-#: build/trans_presets.java:1631 build/trans_presets.java:1638
-#: build/trans_presets.java:1645 build/trans_presets.java:1651
-#: build/trans_presets.java:1657 build/trans_presets.java:1663
-#: build/trans_presets.java:1671 build/trans_presets.java:1677
-#: build/trans_presets.java:1684 build/trans_presets.java:1692
-#: build/trans_presets.java:1698 build/trans_presets.java:1705
-#: build/trans_presets.java:1711 build/trans_presets.java:1721
-#: build/trans_presets.java:1726 build/trans_presets.java:1733
-#: build/trans_presets.java:1739 build/trans_presets.java:1745
-#: build/trans_presets.java:1751 build/trans_presets.java:1756
-#: build/trans_presets.java:1761 build/trans_presets.java:1768
-#: build/trans_presets.java:1774 build/trans_presets.java:1779
-#: build/trans_presets.java:1787 build/trans_presets.java:1796
-#: build/trans_presets.java:1805 build/trans_presets.java:1814
-#: build/trans_presets.java:1823 build/trans_presets.java:1828
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1926
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
-#: build/trans_presets.java:2052 build/trans_presets.java:2058
-#: build/trans_presets.java:2064 build/trans_presets.java:2071
-#: build/trans_presets.java:2078 build/trans_presets.java:2086
-#: build/trans_presets.java:2093 build/trans_presets.java:2099
-#: build/trans_presets.java:2105 build/trans_presets.java:2111
-#: build/trans_presets.java:2117 build/trans_presets.java:2123
-#: build/trans_presets.java:2131 build/trans_presets.java:2138
-#: build/trans_presets.java:2144 build/trans_presets.java:2151
-#: build/trans_presets.java:2159 build/trans_presets.java:2190
-#: build/trans_presets.java:2195 build/trans_presets.java:2200
-#: build/trans_presets.java:2205 build/trans_presets.java:2211
-#: build/trans_presets.java:2217 build/trans_presets.java:2223
-#: build/trans_presets.java:2231 build/trans_presets.java:2237
-#: build/trans_presets.java:2243 build/trans_presets.java:2249
-#: build/trans_presets.java:2255 build/trans_presets.java:2265
-#: build/trans_presets.java:2358 build/trans_presets.java:2365
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2391 build/trans_presets.java:2412
-#: build/trans_presets.java:2418 build/trans_presets.java:2424
-#: build/trans_presets.java:2429 build/trans_presets.java:2435
-#: build/trans_presets.java:2440 build/trans_presets.java:2445
-#: build/trans_presets.java:2450 build/trans_presets.java:2455
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2483 build/trans_presets.java:2488
-#: build/trans_presets.java:2493 build/trans_presets.java:2498
-#: build/trans_presets.java:2503 build/trans_presets.java:2509
-#: build/trans_presets.java:2515 build/trans_presets.java:2521
-#: build/trans_presets.java:2526 build/trans_presets.java:2531
-#: build/trans_presets.java:2540 build/trans_presets.java:2547
-#: build/trans_presets.java:2561 build/trans_presets.java:2566
-#: build/trans_presets.java:2573 build/trans_presets.java:2579
-#: build/trans_presets.java:2599 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2620
-#: build/trans_presets.java:2626 build/trans_presets.java:2632
-#: build/trans_presets.java:2639 build/trans_presets.java:2646
-#: build/trans_presets.java:2653 build/trans_presets.java:2659
-#: build/trans_presets.java:2665 build/trans_presets.java:2673
-#: build/trans_presets.java:2680 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2700
-#: build/trans_presets.java:2707 build/trans_presets.java:2716
-#: build/trans_presets.java:2722 build/trans_presets.java:2728
-#: build/trans_presets.java:2734 build/trans_presets.java:2740
-#: build/trans_presets.java:2749 build/trans_presets.java:2759
-#: build/trans_presets.java:2768 build/trans_presets.java:2774
-#: build/trans_presets.java:2780 build/trans_presets.java:2785
-#: build/trans_presets.java:2791 build/trans_presets.java:2797
-#: build/trans_presets.java:2806 build/trans_presets.java:2812
-#: build/trans_presets.java:2818 build/trans_presets.java:2824
-#: build/trans_presets.java:2830 build/trans_presets.java:2836
-#: build/trans_presets.java:2842 build/trans_presets.java:2849
-#: build/trans_presets.java:2855 build/trans_presets.java:2860
-#: build/trans_presets.java:2867 build/trans_presets.java:2874
-#: build/trans_presets.java:2880 build/trans_presets.java:2889
-#: build/trans_presets.java:2897 build/trans_presets.java:2903
-#: build/trans_presets.java:2909 build/trans_presets.java:2916
-#: build/trans_presets.java:2922 build/trans_presets.java:2929
-#: build/trans_presets.java:2935 build/trans_presets.java:2941
-#: build/trans_presets.java:2947 build/trans_presets.java:2953
-#: build/trans_presets.java:2966 build/trans_presets.java:2980
-#: build/trans_presets.java:2994
+#: build/trans_presets.java:1500 build/trans_presets.java:1517
+#: build/trans_presets.java:1524 build/trans_presets.java:1539
+#: build/trans_presets.java:1546 build/trans_presets.java:1551
+#: build/trans_presets.java:1557 build/trans_presets.java:1563
+#: build/trans_presets.java:1568 build/trans_presets.java:1574
+#: build/trans_presets.java:1580 build/trans_presets.java:1588
+#: build/trans_presets.java:1595 build/trans_presets.java:1602
+#: build/trans_presets.java:1608 build/trans_presets.java:1613
+#: build/trans_presets.java:1619 build/trans_presets.java:1625
+#: build/trans_presets.java:1632 build/trans_presets.java:1639
+#: build/trans_presets.java:1646 build/trans_presets.java:1652
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1672 build/trans_presets.java:1678
+#: build/trans_presets.java:1685 build/trans_presets.java:1693
+#: build/trans_presets.java:1699 build/trans_presets.java:1706
+#: build/trans_presets.java:1712 build/trans_presets.java:1722
+#: build/trans_presets.java:1727 build/trans_presets.java:1734
+#: build/trans_presets.java:1740 build/trans_presets.java:1746
+#: build/trans_presets.java:1752 build/trans_presets.java:1757
+#: build/trans_presets.java:1762 build/trans_presets.java:1769
+#: build/trans_presets.java:1775 build/trans_presets.java:1780
+#: build/trans_presets.java:1788 build/trans_presets.java:1797
+#: build/trans_presets.java:1806 build/trans_presets.java:1815
+#: build/trans_presets.java:1824 build/trans_presets.java:1829
+#: build/trans_presets.java:1836 build/trans_presets.java:1842
+#: build/trans_presets.java:1848 build/trans_presets.java:1854
+#: build/trans_presets.java:1860 build/trans_presets.java:1866
+#: build/trans_presets.java:1872 build/trans_presets.java:1878
+#: build/trans_presets.java:1884 build/trans_presets.java:1890
+#: build/trans_presets.java:1896 build/trans_presets.java:1902
+#: build/trans_presets.java:1908 build/trans_presets.java:1914
+#: build/trans_presets.java:1920 build/trans_presets.java:1927
+#: build/trans_presets.java:1936 build/trans_presets.java:1944
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2040
+#: build/trans_presets.java:2053 build/trans_presets.java:2059
+#: build/trans_presets.java:2065 build/trans_presets.java:2072
+#: build/trans_presets.java:2079 build/trans_presets.java:2087
+#: build/trans_presets.java:2094 build/trans_presets.java:2100
+#: build/trans_presets.java:2106 build/trans_presets.java:2112
+#: build/trans_presets.java:2118 build/trans_presets.java:2124
+#: build/trans_presets.java:2132 build/trans_presets.java:2139
+#: build/trans_presets.java:2145 build/trans_presets.java:2152
+#: build/trans_presets.java:2160 build/trans_presets.java:2191
+#: build/trans_presets.java:2196 build/trans_presets.java:2201
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2232 build/trans_presets.java:2238
+#: build/trans_presets.java:2244 build/trans_presets.java:2250
+#: build/trans_presets.java:2256 build/trans_presets.java:2266
+#: build/trans_presets.java:2359 build/trans_presets.java:2366
+#: build/trans_presets.java:2380 build/trans_presets.java:2386
+#: build/trans_presets.java:2392 build/trans_presets.java:2413
+#: build/trans_presets.java:2419 build/trans_presets.java:2425
+#: build/trans_presets.java:2430 build/trans_presets.java:2436
+#: build/trans_presets.java:2441 build/trans_presets.java:2446
+#: build/trans_presets.java:2451 build/trans_presets.java:2456
+#: build/trans_presets.java:2461 build/trans_presets.java:2467
+#: build/trans_presets.java:2473 build/trans_presets.java:2479
+#: build/trans_presets.java:2484 build/trans_presets.java:2489
+#: build/trans_presets.java:2494 build/trans_presets.java:2499
+#: build/trans_presets.java:2504 build/trans_presets.java:2510
+#: build/trans_presets.java:2516 build/trans_presets.java:2522
+#: build/trans_presets.java:2527 build/trans_presets.java:2532
+#: build/trans_presets.java:2541 build/trans_presets.java:2548
+#: build/trans_presets.java:2562 build/trans_presets.java:2567
+#: build/trans_presets.java:2574 build/trans_presets.java:2580
+#: build/trans_presets.java:2600 build/trans_presets.java:2609
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2627 build/trans_presets.java:2633
+#: build/trans_presets.java:2640 build/trans_presets.java:2647
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2674
+#: build/trans_presets.java:2681 build/trans_presets.java:2688
+#: build/trans_presets.java:2694 build/trans_presets.java:2701
+#: build/trans_presets.java:2708 build/trans_presets.java:2717
+#: build/trans_presets.java:2723 build/trans_presets.java:2729
+#: build/trans_presets.java:2735 build/trans_presets.java:2741
+#: build/trans_presets.java:2750 build/trans_presets.java:2760
+#: build/trans_presets.java:2769 build/trans_presets.java:2775
+#: build/trans_presets.java:2781 build/trans_presets.java:2786
+#: build/trans_presets.java:2792 build/trans_presets.java:2798
+#: build/trans_presets.java:2807 build/trans_presets.java:2813
+#: build/trans_presets.java:2819 build/trans_presets.java:2825
+#: build/trans_presets.java:2831 build/trans_presets.java:2837
+#: build/trans_presets.java:2843 build/trans_presets.java:2850
+#: build/trans_presets.java:2856 build/trans_presets.java:2861
+#: build/trans_presets.java:2868 build/trans_presets.java:2875
+#: build/trans_presets.java:2881 build/trans_presets.java:2890
+#: build/trans_presets.java:2898 build/trans_presets.java:2904
+#: build/trans_presets.java:2910 build/trans_presets.java:2917
+#: build/trans_presets.java:2923 build/trans_presets.java:2930
+#: build/trans_presets.java:2936 build/trans_presets.java:2942
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2967 build/trans_presets.java:2981
+#: build/trans_presets.java:2995
 msgid "Name"
 msgstr "Nimi"
@@ -6235,5 +6531,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:36
-msgid "Login name (email) to the OSM account."
+msgid "Login name (e-mail) to the OSM account."
 msgstr ""
 
@@ -6248,6 +6544,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
-msgid "OSM username (email)"
-msgstr "OSM kasutajanimi (email)"
+msgid "OSM username (e-mail)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
@@ -6258,5 +6554,5 @@
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
-"<br>The password is transfered in plain text to the server, encoded in the "
+"<br>The password is transferred in plain text to the server, encoded in the "
 "URL.<br><b>Do not use a valuable Password.</b></html>"
 msgstr ""
@@ -6550,6 +6846,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:43
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:94
-#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:39
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:96
+#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:64
+#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:37
 msgid "Contacting OSM Server..."
 msgstr "Ühendun OSM serveriga..."
@@ -6560,7 +6857,7 @@
 msgstr "Laen alla punkte alates {0} kuni {1}..."
 
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:100
-#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:32
-#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:50
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:102
+#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:33
+#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:49
 msgid "Downloading OSM data..."
 msgstr "Laen alla OSM andmeid..."
@@ -6625,15 +6922,14 @@
 msgstr "NMEA impordi viga!"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:153
-#, java-format
-msgid "preference {0} missing. Can't initialize OsmApi"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:206
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81
+#, java-format
+msgid "preference ''{0}'' missing. Can't initialize OsmApi"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:171
 msgid "This version of JOSM is incompatible with the configured server."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:207
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172
 #, java-format
 msgid ""
@@ -6642,31 +6938,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:211
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:176
 #, java-format
 msgid "Communications with {0} established using protocol version {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:250
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:265
-msgid "Cannot read numeric value from response"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:336
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:236
+#, java-format
+msgid "unexpected format of id replied by the server, got ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:260
+#, java-format
+msgid ""
+"unexpected format of new version of modified primitive ''{0}'', got ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:283
 msgid "Opening changeset..."
 msgstr "Avan muutustekogumit..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:351
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298
 msgid "Closing changeset..."
 msgstr "Sulgen muutustekogumit..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:367
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:314
 msgid "No changeset present for diff upload"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:376
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:321
 msgid "Preparing..."
 msgstr "Ettevalmistus..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:381
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:326
 msgid "Uploading..."
 msgstr "Üleslaadimine..."
@@ -6681,25 +6983,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:80
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:73
 msgid "Incorrect password or username."
 msgstr "Vale salasõna või kasutajanimi."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:87
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:81
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Ettevaatust: Salasõna saadetakse krüpteerimata."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:85
 msgid "Save user and password (unencrypted)"
 msgstr "Salvesta kasutaja ja salasõna (krüpteerimata)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:89
 msgid "Enter Password"
 msgstr "Sisesta salasõna"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
 msgid "Login"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:134
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:128
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:373
 msgid "Aborting..."
@@ -6710,4 +7012,47 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:68
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:102
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:110
+#, java-format
+msgid "mandatory attribute ''{0}'' missing"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:74
+#, java-format
+msgid "illegal value for mandatory attribute ''{0}'' of type long, got ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:77
+#, java-format
+msgid ""
+"illegal value for mandatory attribute ''{0}'' of type long (>=0), got ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:91
+#, java-format
+msgid "illegal value for mandatory attribute ''{0}'' of type int, got ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:94
+#, java-format
+msgid ""
+"illegal value for mandatory attribute ''{0}'' of type int (>=0), got ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:114
+#, java-format
+msgid ""
+"illegal value for mandatory attribute ''{0}'' of type boolean, got ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:174
+#, java-format
+msgid ""
+"illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType, got "
+"''{1}''"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/io/OsmIdReader.java:38
 msgid "Error during parse."
@@ -6800,26 +7145,32 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:27
+#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:39
+#, java-format
+msgid "parameter ''{0}'' >= 0 expected, got ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:72
+msgid "Downloading history..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:28
 msgid "Contacting Server..."
 msgstr "Ühendun serveriga..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:86
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:58
+#, java-format
+msgid "Failed to open connection to API {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75
 msgid ""
 "Couldn't connect to the osm server. Please check your internet connection."
 msgstr "Ei saanud ühendust osm serveriga. Kontrollige oma interneti-ühendust."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:92
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:103
+#, java-format
 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 ."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:103
-#, java-format
-msgid ""
-"WARNING: preference '{0}' or api version {1} of dataset requires to use "
-"changesets, but API is not handle them. Ignoring changesets."
+"WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to "
+"use changesets, but API is not handle them. Ignoring changesets."
 msgstr ""
 
@@ -6835,5 +7186,5 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:129
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:120
 msgid "Download Plugins"
 msgstr ""
@@ -7011,9 +7362,9 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:127
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
 msgid "Download missing plugins"
 msgstr "Lae alla puuduvad pluginad"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:128
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:119
 #, java-format
 msgid ""
@@ -7026,6 +7377,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:189
 #: build/trans_presets.java:312 build/trans_presets.java:313
 #: build/trans_presets.java:314 build/trans_presets.java:315
@@ -7048,35 +7399,35 @@
 msgstr "tundmatu"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:194
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:185
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr "{0}: Versioon {1}{2}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:202
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:193
 msgid "Plugin bundled with JOSM"
 msgstr "Plugin kaasatud JOSMi"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:346
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:337
 #, java-format
 msgid "Error reading plugin information file: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:289
+#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:300
 msgid "This is after the end of the recording"
 msgstr "See jääb peale lindistuse lõppu"
 
-#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:329
+#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:340
 msgid "Error playing sound"
 msgstr "Viga heili esitamisel"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
 msgid "Do nothing"
 msgstr "Ära tee midagi"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
 msgid "Report Bug"
 msgstr "Teata veast."
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:52
 msgid ""
 "An unexpected exception occurred.\n"
@@ -7086,18 +7437,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55
 msgid "Unexpected Exception"
 msgstr "Ootamatu erandolukord"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:67
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66
 #, java-format
 msgid "Please report a ticket at {0}"
 msgstr "Palun teata piletiga {0}"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:68
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:67
 msgid "Include your steps to get to the error (as detailed as possible)!"
 msgstr "Lisa vea tekkimise käik (nii detailselt kui võimalik)!"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:68
 msgid ""
 "Try updating to the newest version of JOSM and all plugins before reporting "
@@ -7107,9 +7458,9 @@
 "teatamist."
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69
 msgid "Be sure to include the following information:"
 msgstr "Lisa kindlasti järgnev info:"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:75
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:74
 msgid "(The text has already been copied to your clipboard.)"
 msgstr "(Tekst on juba kopeeritud clipboardi.)"
@@ -7193,5 +7544,5 @@
 #. item "Relations/Route" text "Symbol description"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:2998
 msgid "Description"
 msgstr ""
@@ -7558,5 +7909,5 @@
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:851
 msgid ""
-"An error occured while trying to match the photos to the GPX track. You can "
+"An error occurred while trying to match the photos to the GPX track. You can "
 "adjust the sliders to manually match the photos."
 msgstr ""
@@ -7590,5 +7941,4 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:339
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:355
 msgid "Error loading file"
@@ -7611,5 +7961,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:42
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:43
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:209
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:165
@@ -7700,6 +8050,6 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:55
 msgid ""
-"A special handler of the french cadastre wms at www.cadastre.gouv."
-"fr<BR><BR>Please read the Terms and Conditions of Use here (in french): "
+"A special handler of the French cadastre wms at www.cadastre.gouv."
+"fr<BR><BR>Please read the Terms and Conditions of Use here (in French): "
 "<br><a href=\"http://www.cadastre.gouv.fr/scpc/html/"
 "CU_01_ConditionsGenerales_fr.html\"> http://www.cadastre.gouv.fr/scpc/html/"
@@ -7775,6 +8125,6 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:43
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:47
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:44
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:48
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:20
 #, java-format
@@ -7782,11 +8132,11 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:51
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:55
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:52
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:56
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:28
 msgid "Contacting WMS Server..."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:157
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:158
 msgid "Create buildings"
 msgstr ""
@@ -7803,13 +8153,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:61
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:62
 msgid "Extract SVG ViewBox..."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:65
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:66
 msgid "Extract best fitting boundary..."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:126
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:127
 msgid "Create boundary"
 msgstr ""
@@ -7830,5 +8180,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:22
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:23
-msgid "Download Image from french Cadastre WMS"
+msgid "Download Image from French Cadastre WMS"
 msgstr ""
 
@@ -7921,5 +8271,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:80
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
@@ -7927,59 +8277,28 @@
 msgstr ""
 
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:176
+#, java-format
+msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:178
+msgid "Is not vectorized."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:179
+#, java-format
+msgid "Raster center: {0}"
+msgstr ""
+
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181
-#, java-format
-msgid "WMS layer ({0}), {1} tile(s) loaded"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:183
-msgid "Is not vectorized."
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184
-#, java-format
-msgid "Raster center: {0}"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186
 msgid "Is vectorized."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:182
 #, java-format
 msgid "Commune bbox: {0}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:282
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
-msgid "Save WMS layer to file"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:287
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:295
-msgid "Save WMS layer"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:309
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
-msgid "Load WMS layer from file"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:314
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:323
-msgid "Load WMS layer"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:324
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:334
-#, java-format
-msgid "Unsupported WMS file version; found {0}, expected {1}"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:325
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:335
-msgid "File Format Error"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:481
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:401
 #, java-format
 msgid ""
@@ -7988,14 +8307,14 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:482
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402
 msgid "Cache Format Error"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:497
-#, java-format
-msgid "Lambert zone {0} in cache  incompatible with current Lambert zone {1}"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:499
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417
+#, java-format
+msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:419
 msgid "Cache Lambert Zone Error"
 msgstr ""
@@ -8090,11 +8409,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:270
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:315
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
 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:305
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
 msgid "Drop existing path"
 msgstr ""
@@ -8104,5 +8423,5 @@
 #. no gps layer
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:135
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:341
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
 msgid "No GPX data layer found."
 msgstr ""
@@ -8389,4 +8708,8 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:112
 msgid "Lakewalker trace"
+msgstr ""
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:10
+msgid "An unknown error has occurred"
 msgstr ""
 
@@ -8698,42 +9021,42 @@
 msgstr ""
 
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:68
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:69
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:66
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67
 msgid "Measured values"
 msgstr ""
 
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:68
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:66
 msgid "Open the measurement window."
 msgstr ""
 
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:74
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:72
 msgid "Reset"
 msgstr ""
 
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:75
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:73
 msgid "Reset current measurement results and delete measurement path."
 msgstr ""
 
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:81
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:79
 msgid "Path Length"
 msgstr ""
 
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:86
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:84
 msgid "Selection Length"
 msgstr ""
 
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:91
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:89
 msgid "Selection Area"
 msgstr ""
 
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:96
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:94
 msgid "Angle"
 msgstr ""
 
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:97
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:95
 msgid "Angle between two selected Nodes"
 msgstr ""
 
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:68
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:60
 msgid "Layer to make measurements"
 msgstr ""
@@ -8790,5 +9113,5 @@
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
-msgid "Open the OpenStreetBugs window and activate the automatic download"
+msgid "Opens the OpenStreetBugs window and activates the automatic download"
 msgstr ""
 
@@ -8864,5 +9187,5 @@
 msgstr ""
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:92
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:96
 msgid ""
 "Firefox not found. Please set firefox executable in the Map Settings page of "
@@ -8870,9 +9193,9 @@
 msgstr ""
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:123
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:127
 msgid "osmarender options"
 msgstr ""
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:124
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:128
 msgid "Firefox executable"
 msgstr ""
@@ -9299,5 +9622,5 @@
 #. item "Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:485
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2173
 msgid "Street name"
 msgstr ""
@@ -9387,5 +9710,5 @@
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:195
-msgid "No intersections found. Nothing was changed."
+msgid "No intersection found. Nothing was changed."
 msgstr ""
 
@@ -10248,19 +10571,18 @@
 "Full WMS URL input format example (landsat)\n"
 "http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n"
-"layers=global_mosaic&styles=&srs=EPSG:4326&\n"
-"format=image/jpeg \n"
+"layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg\n"
 "\n"
 "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you "
 "only need to input the relevant 'id'.\n"
 "To add a Metacarta Map Rectifier menu item, manually create the URL like in "
-"this example,replacing 73 with your image id: \n"
+"this example, replacing 73 with your image id:\n"
 "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n"
 "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n"
-" \n"
+"\n"
 "Note: Make sure the image is suitable, copyright-wise, if in doubt, don't "
 "use."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:54
+#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:53
 msgid "WMS Plugin Help"
 msgstr ""
@@ -10319,5 +10641,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113
 #, java-format
 msgid ""
@@ -10359,4 +10681,29 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:272
 msgid "Alpha channel"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
+msgid "Save WMS layer to file"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:295
+msgid "Save WMS layer"
+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
+#, java-format
+msgid "Unsupported WMS file version; found {0}, expected {1}"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:335
+msgid "File Format Error"
 msgstr ""
 
@@ -10448,4 +10795,9 @@
 #. Java message loading audio data
 #: build/specialmessages.java:10
+msgid "Audio Device Unavailable"
+msgstr ""
+
+#. Java message loading audio data
+#: build/specialmessages.java:11
 msgid "You must make your edits public to upload new data"
 msgstr ""
@@ -10460,5 +10812,5 @@
 #. Plugin cadastre-fr
 #: build/trans_plugins.java:5
-msgid "A special handler for the french land registry WMS server."
+msgid "A special handler for the French land registry WMS server."
 msgstr ""
 
@@ -10742,5 +11094,5 @@
 #: build/trans_presets.java:110 build/trans_presets.java:130
 #: build/trans_presets.java:167 build/trans_presets.java:187
-#: build/trans_presets.java:1525 build/trans_presets.java:2995
+#: build/trans_presets.java:1526 build/trans_presets.java:2996
 msgid "Reference"
 msgstr ""
@@ -11242,5 +11594,5 @@
 #: build/trans_presets.java:704 build/trans_presets.java:717
 #: build/trans_presets.java:730 build/trans_presets.java:1284
-#: build/trans_presets.java:1467 build/trans_presets.java:1508
+#: build/trans_presets.java:1467 build/trans_presets.java:1509
 msgid "Width (meters)"
 msgstr ""
@@ -11709,7 +12061,7 @@
 #: build/trans_presets.java:338 build/trans_presets.java:635
 #: build/trans_presets.java:773 build/trans_presets.java:1111
-#: build/trans_presets.java:1367 build/trans_presets.java:2264
-#: build/trans_presets.java:2750 build/trans_presets.java:2760
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:1367 build/trans_presets.java:2265
+#: build/trans_presets.java:2751 build/trans_presets.java:2761
+#: build/trans_presets.java:2770
 msgid "Type"
 msgstr ""
@@ -12325,10 +12677,10 @@
 #: build/trans_presets.java:1382 build/trans_presets.java:1388
 #: build/trans_presets.java:1396 build/trans_presets.java:1403
-#: build/trans_presets.java:2272 build/trans_presets.java:2279
-#: build/trans_presets.java:2295 build/trans_presets.java:2306
-#: build/trans_presets.java:2314 build/trans_presets.java:2321
-#: build/trans_presets.java:2371 build/trans_presets.java:2398
-#: build/trans_presets.java:2553 build/trans_presets.java:2589
-#: build/trans_presets.java:3000
+#: build/trans_presets.java:2273 build/trans_presets.java:2280
+#: build/trans_presets.java:2296 build/trans_presets.java:2307
+#: build/trans_presets.java:2315 build/trans_presets.java:2322
+#: build/trans_presets.java:2372 build/trans_presets.java:2399
+#: build/trans_presets.java:2554 build/trans_presets.java:2590
+#: build/trans_presets.java:3001
 msgid "Operator"
 msgstr ""
@@ -12540,7 +12892,7 @@
 #. item "Places/Glacier" text "Name"
 #. item "Places/Volcano" text "Name"
-#: build/trans_presets.java:827 build/trans_presets.java:1568
-#: build/trans_presets.java:1693 build/trans_presets.java:2694
-#: build/trans_presets.java:2701 build/trans_presets.java:2708
+#: build/trans_presets.java:827 build/trans_presets.java:1569
+#: build/trans_presets.java:1694 build/trans_presets.java:2695
+#: build/trans_presets.java:2702 build/trans_presets.java:2709
 msgid "Elevation"
 msgstr ""
@@ -13472,5 +13824,5 @@
 
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1369 build/trans_presets.java:2308
+#: build/trans_presets.java:1369 build/trans_presets.java:2309
 msgid "Fee"
 msgstr ""
@@ -13606,5 +13958,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1466 build/trans_presets.java:1507
+#: build/trans_presets.java:1466 build/trans_presets.java:1508
 msgid "Reference (track number)"
 msgstr ""
@@ -13612,5 +13964,5 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1468 build/trans_presets.java:1509
+#: build/trans_presets.java:1468 build/trans_presets.java:1510
 msgid "Area"
 msgstr ""
@@ -13662,11 +14014,21 @@
 
 #. item "Public Transport/Bus Stop" text "Name"
+#. item "Tourism/Other Information Points" text "Closer Description"
+#. <separator/>
+#. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
+#. <key key="amenity" value="hunting_stand" />
+#: build/trans_presets.java:1501 build/trans_presets.java:1703
+#: build/trans_presets.java:2349
+msgid "Shelter"
+msgstr ""
+
+#. item "Public Transport/Bus Stop" check "Shelter"
 #. </optional>
-#: build/trans_presets.java:1503
+#: build/trans_presets.java:1504
 msgid "Bus Platform"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1504
+#: build/trans_presets.java:1505
 msgid "Edit Bus Platform"
 msgstr ""
@@ -13674,5 +14036,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1512
+#: build/trans_presets.java:1513
 msgid "Taxi"
 msgstr ""
@@ -13680,5 +14042,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1514
+#: build/trans_presets.java:1515
 msgid "Edit Taxi station"
 msgstr ""
@@ -13686,5 +14048,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1519
+#: build/trans_presets.java:1520
 msgid "Airport"
 msgstr ""
@@ -13692,15 +14054,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1521
+#: build/trans_presets.java:1522
 msgid "Edit Airport"
 msgstr ""
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1526
+#: build/trans_presets.java:1527
 msgid "IATA"
 msgstr ""
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1527
+#: build/trans_presets.java:1528
 msgid "ICAO"
 msgstr ""
@@ -13709,5 +14071,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1532
+#: build/trans_presets.java:1533
 msgid "Accomodation"
 msgstr ""
@@ -13719,5 +14081,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1533 build/trans_surveyor.java:43
+#: build/trans_presets.java:1534 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr ""
@@ -13726,15 +14088,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1536
+#: build/trans_presets.java:1537
 msgid "Edit Hotel"
 msgstr ""
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1539
+#: build/trans_presets.java:1540
 msgid "Stars"
 msgstr ""
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1541
+#: build/trans_presets.java:1542
 msgid "Motel"
 msgstr ""
@@ -13742,20 +14104,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1543
+#: build/trans_presets.java:1544
 msgid "Edit Motel"
 msgstr ""
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1547
+#: build/trans_presets.java:1548
 msgid "Guest House"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1548
+#: build/trans_presets.java:1549
 msgid "Edit Guest House"
 msgstr ""
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1552
+#: build/trans_presets.java:1553
 msgid "Chalet"
 msgstr ""
@@ -13763,10 +14125,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1554
+#: build/trans_presets.java:1555
 msgid "Edit Chalet"
 msgstr ""
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1558
+#: build/trans_presets.java:1559
 msgid "Hostel"
 msgstr ""
@@ -13774,30 +14136,30 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1560
+#: build/trans_presets.java:1561
 msgid "Edit Hostel"
 msgstr ""
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1564
+#: build/trans_presets.java:1565
 msgid "Alpine Hut"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1565
+#: build/trans_presets.java:1566
 msgid "Edit Alpine Hut"
 msgstr ""
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1570
+#: build/trans_presets.java:1571
 msgid "Caravan Site"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1571
+#: build/trans_presets.java:1572
 msgid "Edit Caravan Site"
 msgstr ""
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1575
+#: build/trans_presets.java:1576
 msgid "Camping Site"
 msgstr ""
@@ -13805,10 +14167,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1577
+#: build/trans_presets.java:1578
 msgid "Edit Camping Site"
 msgstr ""
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1582
+#: build/trans_presets.java:1583
 msgid "Food+Drinks"
 msgstr ""
@@ -13819,5 +14181,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1583 build/trans_surveyor.java:47
+#: build/trans_presets.java:1584 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr ""
@@ -13825,5 +14187,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1586
 msgid "Edit Restaurant"
 msgstr ""
@@ -13831,5 +14193,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "Cuisine"
 msgstr ""
@@ -13837,61 +14199,61 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "italian"
 msgstr ""
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "chinese"
 msgstr ""
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "pizza"
 msgstr ""
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "burger"
 msgstr ""
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "greek"
 msgstr ""
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "german"
 msgstr ""
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "indian"
 msgstr ""
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "regional"
 msgstr ""
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "kebab"
 msgstr ""
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "turkish"
 msgstr ""
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "asian"
 msgstr ""
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "thai"
 msgstr ""
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "mexican"
 msgstr ""
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "japanese"
 msgstr ""
 
-#: build/trans_presets.java:1590
+#: build/trans_presets.java:1591
 msgid "Fast Food"
 msgstr ""
@@ -13899,9 +14261,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1592
+#: build/trans_presets.java:1593
 msgid "Edit Fast Food Restaurant"
 msgstr ""
 
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1598
 msgid "Cafe"
 msgstr ""
@@ -13909,10 +14271,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1599
+#: build/trans_presets.java:1600
 msgid "Edit Cafe"
 msgstr ""
 
 #. item "Food+Drinks/Cafe" text "Name"
-#: build/trans_presets.java:1603
+#: build/trans_presets.java:1604
 msgid "Pub"
 msgstr ""
@@ -13920,20 +14282,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1605
+#: build/trans_presets.java:1606
 msgid "Edit Pub"
 msgstr ""
 
 #. item "Food+Drinks/Pub" text "Name"
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1610
 msgid "Biergarten"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1610
+#: build/trans_presets.java:1611
 msgid "Edit Biergarten"
 msgstr ""
 
 #. item "Food+Drinks/Biergarten" text "Name"
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1615
 msgid "Bar"
 msgstr ""
@@ -13941,10 +14303,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1616
+#: build/trans_presets.java:1617
 msgid "Edit Bar"
 msgstr ""
 
 #. item "Food+Drinks/Bar" text "Name"
-#: build/trans_presets.java:1620
+#: build/trans_presets.java:1621
 msgid "Nightclub"
 msgstr ""
@@ -13952,20 +14314,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1622
+#: build/trans_presets.java:1623
 msgid "Edit Nightclub"
 msgstr ""
 
 #. item "Food+Drinks/Nightclub" text "Name"
-#: build/trans_presets.java:1627
+#: build/trans_presets.java:1628
 msgid "Tourism"
 msgstr ""
 
 #. group "Tourism"
-#: build/trans_presets.java:1628
+#: build/trans_presets.java:1629
 msgid "Attraction"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1629
+#: build/trans_presets.java:1630
 msgid "Edit Attraction"
 msgstr ""
@@ -13974,11 +14336,11 @@
 #. item "Tourism/Information Office" text "Name"
 #. item "Amenities/Baby Hatch" text "Operator"
-#: build/trans_presets.java:1632 build/trans_presets.java:1672
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:1633 build/trans_presets.java:1673
+#: build/trans_presets.java:2373
 msgid "Opening Hours"
 msgstr ""
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1634
+#: build/trans_presets.java:1635
 msgid "Museum"
 msgstr ""
@@ -13986,10 +14348,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1636
+#: build/trans_presets.java:1637
 msgid "Edit Museum"
 msgstr ""
 
 #. item "Tourism/Museum" text "Name"
-#: build/trans_presets.java:1640
+#: build/trans_presets.java:1641
 msgid "Zoo"
 msgstr ""
@@ -13998,10 +14360,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1644
 msgid "Edit Zoo"
 msgstr ""
 
 #. item "Tourism/Zoo" text "Name"
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1648
 msgid "Viewpoint"
 msgstr ""
@@ -14009,25 +14371,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1649
+#: build/trans_presets.java:1650
 msgid "Edit Viewpoint"
 msgstr ""
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1652
+#: build/trans_presets.java:1653
 msgid "Look-Out Tower"
 msgstr ""
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1654
+#: build/trans_presets.java:1655
 msgid "Theme Park"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1655
+#: build/trans_presets.java:1656
 msgid "Edit Theme Park"
 msgstr ""
 
 #. item "Tourism/Theme Park" text "Name"
-#: build/trans_presets.java:1659
+#: build/trans_presets.java:1660
 msgid "Artwork"
 msgstr ""
@@ -14035,5 +14397,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1661
+#: build/trans_presets.java:1662
 msgid "Edit Artwork"
 msgstr ""
@@ -14041,5 +14403,5 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1667
 msgid "Information Office"
 msgstr ""
@@ -14047,83 +14409,80 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1669
 msgid "Edit Information Office"
 msgstr ""
 
+#. item "Tourism/Information Office" text "Opening Hours"
+#: build/trans_presets.java:1675
+msgid "Map"
+msgstr "Kaart"
+
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1679
 msgid "Map Type"
 msgstr ""
 
 #. item "Tourism/Map" combo "Map Type"
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1679
 msgid "map"
 msgstr ""
 
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1679
 msgid "citymap"
 msgstr ""
 
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1679
 msgid "hikingmap"
 msgstr ""
 
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1679
 msgid "bicyclemap"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1679 build/trans_presets.java:1686
-#: build/trans_presets.java:1699
+#: build/trans_presets.java:1680 build/trans_presets.java:1687
+#: build/trans_presets.java:1700
 msgid "Closer Description"
 msgstr ""
 
 #. item "Tourism/Map" text "Closer Description"
-#: build/trans_presets.java:1681
+#: build/trans_presets.java:1682
 msgid "Information Board"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1686
 msgid "Board Type"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Type"
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1686
 msgid "board"
 msgstr ""
 
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1686
 msgid "history"
 msgstr ""
 
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1686
 msgid "nature"
 msgstr ""
 
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1686
 msgid "wildlife"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1688
+#: build/trans_presets.java:1689
 msgid "Guidepost (Hiking)"
 msgstr ""
 
 #. item "Tourism/Guidepost (Hiking)" text "Elevation"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1696
 msgid "Other Information Points"
 msgstr ""
 
-#. item "Tourism/Other Information Points" text "Closer Description"
-#. <separator/>
-#. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
-#. <key key="amenity" value="hunting_stand" />
-#: build/trans_presets.java:1702 build/trans_presets.java:2348
-msgid "Shelter"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:1703
+#. item
+#: build/trans_presets.java:1704
 msgid "Edit Shelter"
 msgstr ""
@@ -14131,25 +14490,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1706 build/trans_presets.java:1712
+#: build/trans_presets.java:1707 build/trans_presets.java:1713
 msgid "Fireplace"
 msgstr ""
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1709
 msgid "Picnic Site"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1709
+#: build/trans_presets.java:1710
 msgid "Edit Picnic Site"
 msgstr ""
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1716
 msgid "Historic Places"
 msgstr ""
 
 #. group "Historic Places"
-#: build/trans_presets.java:1716
+#: build/trans_presets.java:1717
 msgid "Castle"
 msgstr ""
@@ -14158,20 +14517,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1719
+#: build/trans_presets.java:1720
 msgid "Edit Castle"
 msgstr ""
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1724
 msgid "Ruins"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1724
+#: build/trans_presets.java:1725
 msgid "Edit Ruins"
 msgstr ""
 
 #. item "Historic Places/Ruins" text "Name"
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1729
 msgid "Archaeological Site"
 msgstr ""
@@ -14180,10 +14539,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1731
+#: build/trans_presets.java:1732
 msgid "Edit Archaeological Site"
 msgstr ""
 
 #. item "Historic Places/Archaeological Site" text "Name"
-#: build/trans_presets.java:1735
+#: build/trans_presets.java:1736
 msgid "Battlefield"
 msgstr ""
@@ -14191,5 +14550,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1738
 msgid "Edit Battlefield"
 msgstr ""
@@ -14197,15 +14556,15 @@
 #. item "Historic Places/Battlefield" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1743
 msgid "Monument"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1744
 msgid "Edit Monument"
 msgstr ""
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1748
 msgid "Memorial"
 msgstr ""
@@ -14213,45 +14572,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1749
+#: build/trans_presets.java:1750
 msgid "Edit Memorial"
 msgstr ""
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1753
+#: build/trans_presets.java:1754
 msgid "Wayside Cross"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1754
+#: build/trans_presets.java:1755
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1758
+#: build/trans_presets.java:1759
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1760
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1765
 msgid "Leisure"
 msgstr ""
 
 #. group "Leisure"
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1766
 msgid "Water Park"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1766
+#: build/trans_presets.java:1767
 msgid "Edit Water Park"
 msgstr ""
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1770
+#: build/trans_presets.java:1771
 msgid "Playground"
 msgstr ""
@@ -14259,15 +14618,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1772
+#: build/trans_presets.java:1773
 msgid "Edit Playground"
 msgstr ""
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1776
+#: build/trans_presets.java:1777
 msgid "Fishing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1777
+#: build/trans_presets.java:1778
 msgid "Edit Fishing"
 msgstr ""
@@ -14275,15 +14634,15 @@
 #. item "Leisure/Fishing" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1783
+#: build/trans_presets.java:1784
 msgid "Sport Facilities"
 msgstr ""
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1784
+#: build/trans_presets.java:1785
 msgid "Stadium"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1785
+#: build/trans_presets.java:1786
 msgid "Edit Stadium"
 msgstr ""
@@ -14297,6 +14656,6 @@
 #. item "Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1789 build/trans_presets.java:1798
-#: build/trans_presets.java:1807 build/trans_presets.java:1816
+#: build/trans_presets.java:1790 build/trans_presets.java:1799
+#: build/trans_presets.java:1808 build/trans_presets.java:1817
 msgid "select sport:"
 msgstr ""
@@ -14672,6 +15031,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1791 build/trans_presets.java:1800
-#: build/trans_presets.java:1809 build/trans_presets.java:1818
+#: 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
@@ -14704,227 +15063,227 @@
 #. item "Sport Facilities/Pitch" combo "sport"
 #. item "Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1791 build/trans_presets.java:1800
-#: build/trans_presets.java:1809 build/trans_presets.java:1818
+#: build/trans_presets.java:1792 build/trans_presets.java:1801
+#: build/trans_presets.java:1810 build/trans_presets.java:1819
 msgid "multi"
 msgstr ""
 
-#: build/trans_presets.java:1791 build/trans_presets.java:1800
-#: build/trans_presets.java:1809 build/trans_presets.java:1818
+#: build/trans_presets.java:1792 build/trans_presets.java:1801
+#: build/trans_presets.java:1810 build/trans_presets.java:1819
 msgid "archery"
 msgstr ""
 
-#: build/trans_presets.java:1791 build/trans_presets.java:1800
-#: build/trans_presets.java:1809 build/trans_presets.java:1818
+#: build/trans_presets.java:1792 build/trans_presets.java:1801
+#: build/trans_presets.java:1810 build/trans_presets.java:1819
 msgid "athletics"
 msgstr ""
 
-#: build/trans_presets.java:1791 build/trans_presets.java:1800
-#: build/trans_presets.java:1809 build/trans_presets.java:1818
+#: build/trans_presets.java:1792 build/trans_presets.java:1801
+#: build/trans_presets.java:1810 build/trans_presets.java:1819
 msgid "australian_football"
 msgstr ""
 
-#: build/trans_presets.java:1791 build/trans_presets.java:1800
-#: build/trans_presets.java:1809 build/trans_presets.java:1818
+#: build/trans_presets.java:1792 build/trans_presets.java:1801
+#: build/trans_presets.java:1810 build/trans_presets.java:1819
 msgid "baseball"
 msgstr ""
 
-#: build/trans_presets.java:1791 build/trans_presets.java:1800
-#: build/trans_presets.java:1809 build/trans_presets.java:1818
+#: build/trans_presets.java:1792 build/trans_presets.java:1801
+#: build/trans_presets.java:1810 build/trans_presets.java:1819
 msgid "basketball"
 msgstr ""
 
-#: build/trans_presets.java:1791 build/trans_presets.java:1800
-#: build/trans_presets.java:1809 build/trans_presets.java:1818
+#: build/trans_presets.java:1792 build/trans_presets.java:1801
+#: build/trans_presets.java:1810 build/trans_presets.java:1819
 msgid "boules"
 msgstr ""
 
-#: build/trans_presets.java:1791 build/trans_presets.java:1800
-#: build/trans_presets.java:1809 build/trans_presets.java:1818
+#: build/trans_presets.java:1792 build/trans_presets.java:1801
+#: build/trans_presets.java:1810 build/trans_presets.java:1819
 msgid "bowls"
 msgstr ""
 
-#: build/trans_presets.java:1791 build/trans_presets.java:1800
-#: build/trans_presets.java:1809 build/trans_presets.java:1818
+#: build/trans_presets.java:1792 build/trans_presets.java:1801
+#: build/trans_presets.java:1810 build/trans_presets.java:1819
 msgid "canoe"
 msgstr ""
 
-#: build/trans_presets.java:1791 build/trans_presets.java:1800
-#: build/trans_presets.java:1809 build/trans_presets.java:1818
+#: build/trans_presets.java:1792 build/trans_presets.java:1801
+#: build/trans_presets.java:1810 build/trans_presets.java:1819
 msgid "climbing"
 msgstr ""
 
-#: build/trans_presets.java:1791 build/trans_presets.java:1800
-#: build/trans_presets.java:1809 build/trans_presets.java:1818
+#: build/trans_presets.java:1792 build/trans_presets.java:1801
+#: build/trans_presets.java:1810 build/trans_presets.java:1819
 msgid "cricket"
 msgstr ""
 
-#: build/trans_presets.java:1791 build/trans_presets.java:1800
-#: build/trans_presets.java:1809 build/trans_presets.java:1818
+#: build/trans_presets.java:1792 build/trans_presets.java:1801
+#: build/trans_presets.java:1810 build/trans_presets.java:1819
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:1791 build/trans_presets.java:1800
-#: build/trans_presets.java:1809 build/trans_presets.java:1818
+#: build/trans_presets.java:1792 build/trans_presets.java:1801
+#: build/trans_presets.java:1810 build/trans_presets.java:1819
 msgid "croquet"
 msgstr ""
 
-#: build/trans_presets.java:1791 build/trans_presets.java:1800
-#: build/trans_presets.java:1809 build/trans_presets.java:1818
+#: build/trans_presets.java:1792 build/trans_presets.java:1801
+#: build/trans_presets.java:1810 build/trans_presets.java:1819
 msgid "cycling"
 msgstr ""
 
-#: build/trans_presets.java:1791 build/trans_presets.java:1800
-#: build/trans_presets.java:1809 build/trans_presets.java:1818
+#: build/trans_presets.java:1792 build/trans_presets.java:1801
+#: build/trans_presets.java:1810 build/trans_presets.java:1819
 msgid "dog_racing"
 msgstr ""
 
-#: build/trans_presets.java:1791 build/trans_presets.java:1800
-#: build/trans_presets.java:1809 build/trans_presets.java:1818
+#: build/trans_presets.java:1792 build/trans_presets.java:1801
+#: build/trans_presets.java:1810 build/trans_presets.java:1819
 msgid "equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1791 build/trans_presets.java:1800
-#: build/trans_presets.java:1809 build/trans_presets.java:1818
+#: build/trans_presets.java:1792 build/trans_presets.java:1801
+#: build/trans_presets.java:1810 build/trans_presets.java:1819
 msgid "football"
 msgstr ""
 
-#: build/trans_presets.java:1791 build/trans_presets.java:1800
-#: build/trans_presets.java:1809 build/trans_presets.java:1818
+#: build/trans_presets.java:1792 build/trans_presets.java:1801
+#: build/trans_presets.java:1810 build/trans_presets.java:1819
 msgid "golf"
 msgstr ""
 
-#: build/trans_presets.java:1791 build/trans_presets.java:1800
-#: build/trans_presets.java:1809 build/trans_presets.java:1818
+#: build/trans_presets.java:1792 build/trans_presets.java:1801
+#: build/trans_presets.java:1810 build/trans_presets.java:1819
 msgid "gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:1791 build/trans_presets.java:1800
-#: build/trans_presets.java:1809 build/trans_presets.java:1818
+#: build/trans_presets.java:1792 build/trans_presets.java:1801
+#: build/trans_presets.java:1810 build/trans_presets.java:1819
 msgid "hockey"
 msgstr ""
 
-#: build/trans_presets.java:1791 build/trans_presets.java:1800
-#: build/trans_presets.java:1809 build/trans_presets.java:1818
+#: build/trans_presets.java:1792 build/trans_presets.java:1801
+#: build/trans_presets.java:1810 build/trans_presets.java:1819
 msgid "horse_racing"
 msgstr ""
 
-#: build/trans_presets.java:1791 build/trans_presets.java:1800
-#: build/trans_presets.java:1809 build/trans_presets.java:1818
+#: build/trans_presets.java:1792 build/trans_presets.java:1801
+#: build/trans_presets.java:1810 build/trans_presets.java:1819
 msgid "motor"
 msgstr ""
 
-#: build/trans_presets.java:1791 build/trans_presets.java:1800
-#: build/trans_presets.java:1809 build/trans_presets.java:1818
+#: build/trans_presets.java:1792 build/trans_presets.java:1801
+#: build/trans_presets.java:1810 build/trans_presets.java:1819
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:1791 build/trans_presets.java:1800
-#: build/trans_presets.java:1809 build/trans_presets.java:1818
+#: build/trans_presets.java:1792 build/trans_presets.java:1801
+#: build/trans_presets.java:1810 build/trans_presets.java:1819
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1791 build/trans_presets.java:1800
-#: build/trans_presets.java:1809 build/trans_presets.java:1818
+#: build/trans_presets.java:1792 build/trans_presets.java:1801
+#: build/trans_presets.java:1810 build/trans_presets.java:1819
 msgid "rugby"
 msgstr ""
 
-#: build/trans_presets.java:1791 build/trans_presets.java:1800
-#: build/trans_presets.java:1809 build/trans_presets.java:1818
+#: build/trans_presets.java:1792 build/trans_presets.java:1801
+#: build/trans_presets.java:1810 build/trans_presets.java:1819
 msgid "shooting"
 msgstr ""
 
-#: build/trans_presets.java:1791 build/trans_presets.java:1800
-#: build/trans_presets.java:1809 build/trans_presets.java:1818
+#: build/trans_presets.java:1792 build/trans_presets.java:1801
+#: build/trans_presets.java:1810 build/trans_presets.java:1819
 msgid "skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1791 build/trans_presets.java:1800
-#: build/trans_presets.java:1809 build/trans_presets.java:1818
+#: build/trans_presets.java:1792 build/trans_presets.java:1801
+#: build/trans_presets.java:1810 build/trans_presets.java:1819
 msgid "skating"
 msgstr ""
 
-#: build/trans_presets.java:1791 build/trans_presets.java:1800
-#: build/trans_presets.java:1809 build/trans_presets.java:1818
+#: build/trans_presets.java:1792 build/trans_presets.java:1801
+#: build/trans_presets.java:1810 build/trans_presets.java:1819
 msgid "skiing"
 msgstr ""
 
-#: build/trans_presets.java:1791 build/trans_presets.java:1800
-#: build/trans_presets.java:1809 build/trans_presets.java:1818
+#: build/trans_presets.java:1792 build/trans_presets.java:1801
+#: build/trans_presets.java:1810 build/trans_presets.java:1819
 msgid "soccer"
 msgstr ""
 
-#: build/trans_presets.java:1791 build/trans_presets.java:1800
-#: build/trans_presets.java:1809 build/trans_presets.java:1818
+#: build/trans_presets.java:1792 build/trans_presets.java:1801
+#: build/trans_presets.java:1810 build/trans_presets.java:1819
 msgid "swimming"
 msgstr ""
 
-#: build/trans_presets.java:1791 build/trans_presets.java:1800
-#: build/trans_presets.java:1809 build/trans_presets.java:1818
+#: build/trans_presets.java:1792 build/trans_presets.java:1801
+#: build/trans_presets.java:1810 build/trans_presets.java:1819
 msgid "table_tennis"
 msgstr ""
 
-#: build/trans_presets.java:1791 build/trans_presets.java:1800
-#: build/trans_presets.java:1809 build/trans_presets.java:1818
+#: build/trans_presets.java:1792 build/trans_presets.java:1801
+#: build/trans_presets.java:1810 build/trans_presets.java:1819
 msgid "tennis"
 msgstr ""
 
-#: build/trans_presets.java:1793
+#: build/trans_presets.java:1794
 msgid "Sports Centre"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1794
+#: build/trans_presets.java:1795
 msgid "Edit Sports Centre"
 msgstr ""
 
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1803
 msgid "Pitch"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1804
 msgid "Edit Pitch"
 msgstr ""
 
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1812
 msgid "Racetrack"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1812
+#: build/trans_presets.java:1813
 msgid "Edit Racetrack"
 msgstr ""
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1821
 msgid "Golf Course"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1822
 msgid "Edit Golf Course"
 msgstr ""
 
 #. item "Sport Facilities/Golf Course" text "Name"
-#: build/trans_presets.java:1825
+#: build/trans_presets.java:1826
 msgid "Miniature Golf"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1826
+#: build/trans_presets.java:1827
 msgid "Edit Miniature Golf"
 msgstr ""
 
 #. item "Sport Facilities/Miniature Golf" text "Name"
-#: build/trans_presets.java:1831
+#: build/trans_presets.java:1832
 msgid "Sport"
 msgstr ""
 
 #. group "Sport"
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1833
 msgid "Multi"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1833
+#: build/trans_presets.java:1834
 msgid "Edit Multi"
 msgstr ""
@@ -14963,191 +15322,191 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1890
-#: build/trans_presets.java:1896 build/trans_presets.java:1902
-#: build/trans_presets.java:1908 build/trans_presets.java:1914
-#: build/trans_presets.java:1920 build/trans_presets.java:1929
-#: build/trans_presets.java:1936 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
-#: build/trans_presets.java:2010 build/trans_presets.java:2016
-#: build/trans_presets.java:2022 build/trans_presets.java:2028
-#: build/trans_presets.java:2034 build/trans_presets.java:2040
+#: 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 "pitch"
 msgstr ""
 
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1890
-#: build/trans_presets.java:1896 build/trans_presets.java:1902
-#: build/trans_presets.java:1908 build/trans_presets.java:1914
-#: build/trans_presets.java:1920 build/trans_presets.java:1929
-#: build/trans_presets.java:1936 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
-#: build/trans_presets.java:2010 build/trans_presets.java:2016
-#: build/trans_presets.java:2022 build/trans_presets.java:2028
-#: build/trans_presets.java:2034 build/trans_presets.java:2040
+#: 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 "sports_centre"
 msgstr ""
 
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1890
-#: build/trans_presets.java:1896 build/trans_presets.java:1902
-#: build/trans_presets.java:1908 build/trans_presets.java:1914
-#: build/trans_presets.java:1920 build/trans_presets.java:1929
-#: build/trans_presets.java:1936 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
-#: build/trans_presets.java:2010 build/trans_presets.java:2016
-#: build/trans_presets.java:2022 build/trans_presets.java:2028
-#: build/trans_presets.java:2034 build/trans_presets.java:2040
+#: 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 "stadium"
 msgstr ""
 
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1839
 msgid "10pin"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1839
+#: build/trans_presets.java:1840
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1845
 msgid "Athletics"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1845
+#: build/trans_presets.java:1846
 msgid "Edit Athletics"
 msgstr ""
 
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1851
 msgid "Archery"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:1852
 msgid "Edit Archery"
 msgstr ""
 
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:1857
 msgid "Climbing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:1858
 msgid "Edit Climbing"
 msgstr ""
 
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1863
 msgid "Canoeing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:1864
 msgid "Edit Canoeing"
 msgstr ""
 
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:1869
 msgid "Cycling"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1870
 msgid "Edit Cycling"
 msgstr ""
 
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1875
 msgid "Dog Racing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1876
 msgid "Edit Dog Racing"
 msgstr ""
 
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1881
 msgid "Equestrian"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:1882
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1887
 msgid "Horse Racing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1888
 msgid "Edit Horse Racing"
 msgstr ""
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:1893
 msgid "Gymnastics"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1893
+#: build/trans_presets.java:1894
 msgid "Edit Gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:1898
+#: build/trans_presets.java:1899
 msgid "Motor Sports"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1899
+#: build/trans_presets.java:1900
 msgid "Edit Motor Sports"
 msgstr ""
 
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:1905
 msgid "Skating"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:1906
 msgid "Edit Skating"
 msgstr ""
 
-#: build/trans_presets.java:1910
+#: build/trans_presets.java:1911
 msgid "Skateboard"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:1912
 msgid "Edit Skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:1917
 msgid "Swimming"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1917
+#: build/trans_presets.java:1918
 msgid "Edit Swimming"
 msgstr ""
 
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:1923
 msgid "Skiing"
 msgstr ""
@@ -15155,56 +15514,56 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:1924
+#: build/trans_presets.java:1925
 msgid "Edit Skiing"
 msgstr ""
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1928
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1928
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1928
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1928
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:1929
 msgid "Difficulty"
 msgstr "Raskusaste"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:1929
 msgid "novice"
 msgstr ""
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:1929
 msgid "easy"
 msgstr "kerge"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:1929
 msgid "intermediate"
 msgstr ""
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:1929
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:1929
 msgid "expert"
 msgstr "ekspert"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:1929
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1932
 msgid "Shooting"
 msgstr ""
@@ -15212,178 +15571,178 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1934
 msgid "Edit Shooting"
 msgstr ""
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1940
 msgid "Sport (Ball)"
 msgstr ""
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1941
 msgid "Soccer"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1941
+#: build/trans_presets.java:1942
 msgid "Edit Soccer"
 msgstr ""
 
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:1947
 msgid "Football"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:1948
 msgid "Edit Football"
 msgstr ""
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1953
 msgid "Australian Football"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:1954
 msgid "Edit Australian Football"
 msgstr ""
 
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:1959
 msgid "Baseball"
 msgstr "Pesapall"
 
 #. item
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:1960
 msgid "Edit Baseball"
 msgstr "Vali pesapall"
 
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:1965
 msgid "Basketball"
 msgstr "Korvpall"
 
 #. item
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:1966
 msgid "Edit Basketball"
 msgstr "Vali korvpall"
 
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:1971
 msgid "Golf"
 msgstr "Golf"
 
 #. item
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:1972
 msgid "Edit Golf"
 msgstr ""
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1975
 msgid "golf_course"
 msgstr ""
 
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:1977
 msgid "Boule"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:1978
 msgid "Edit Boule"
 msgstr ""
 
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:1983
 msgid "Bowls"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1984
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:1989
 msgid "Cricket"
 msgstr "Kriket"
 
 #. item
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:1990
 msgid "Edit Cricket"
 msgstr "Redihgeeri kriket"
 
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:1995
 msgid "Cricket Nets"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:1996
 msgid "Edit Cricket Nets"
 msgstr ""
 
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:2001
 msgid "Croquet"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:2002
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:2006
+#: build/trans_presets.java:2007
 msgid "Hockey"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2007
+#: build/trans_presets.java:2008
 msgid "Edit Hockey"
 msgstr ""
 
-#: build/trans_presets.java:2012
+#: build/trans_presets.java:2013
 msgid "Pelota"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2014
 msgid "Edit Pelota"
 msgstr ""
 
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2019
 msgid "Racquet"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2020
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2024
+#: build/trans_presets.java:2025
 msgid "Rugby"
 msgstr "Ragbi"
 
 #. item
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2026
 msgid "Edit Rugby"
 msgstr "Vali ragbi"
 
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:2031
 msgid "Table Tennis"
 msgstr "Laua tennis"
 
 #. item
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2032
 msgid "Edit Table Tennis"
 msgstr "Vali laua tennis"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2037
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item
-#: build/trans_presets.java:2037
+#: build/trans_presets.java:2038
 msgid "Edit Tennis"
 msgstr "Vali tennis"
 
 #. <separator/>
-#: build/trans_presets.java:2044
+#: build/trans_presets.java:2045
 msgid "Buildings"
 msgstr "Ehitised"
 
 #. group "Buildings"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2046
 msgid "Building"
 msgstr "Ehirus"
@@ -15391,5 +15750,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2049
 msgid "Public Building"
 msgstr ""
@@ -15397,10 +15756,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2050
+#: build/trans_presets.java:2051
 msgid "Edit Public Building"
 msgstr ""
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2055
 msgid "Town hall"
 msgstr "Linna hall"
@@ -15408,10 +15767,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2056
+#: build/trans_presets.java:2057
 msgid "Edit Town hall"
 msgstr "Vali linna hall"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2061
 msgid "Embassy"
 msgstr "Saatkond"
@@ -15419,10 +15778,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2062
+#: build/trans_presets.java:2063
 msgid "Edit Embassy"
 msgstr "Vali saatkond"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2066
+#: build/trans_presets.java:2067
 msgid "Courthouse"
 msgstr "Kohtumaja"
@@ -15431,10 +15790,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2070
 msgid "Edit Courthouse"
 msgstr "Vali kohtumaja"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2074
 msgid "Prison"
 msgstr "Vangla"
@@ -15443,10 +15802,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2077
 msgid "Edit Prison"
 msgstr "Vali vangla"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2080
+#: build/trans_presets.java:2081
 msgid "Police"
 msgstr "Politsei"
@@ -15456,10 +15815,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2084
+#: build/trans_presets.java:2085
 msgid "Edit Police"
 msgstr "Vali politsei"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2089
 msgid "Fire Station"
 msgstr "Tuletõrjedepoo"
@@ -15468,10 +15827,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2092
 msgid "Edit Fire Station"
 msgstr "Vali tuletõrjedepoo"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2096
 msgid "Post Office"
 msgstr ""
@@ -15479,5 +15838,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2097
+#: build/trans_presets.java:2098
 msgid "Edit Post Office"
 msgstr ""
@@ -15485,15 +15844,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2103
 msgid "Kindergarten"
 msgstr "Lasteaed"
 
 #. item
-#: build/trans_presets.java:2103
+#: build/trans_presets.java:2104
 msgid "Edit Kindergarten"
 msgstr "Vali lasteaed"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2108
 msgid "School"
 msgstr "Kool"
@@ -15501,10 +15860,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:2110
 msgid "Edit School"
 msgstr "Vali kool"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2114
 msgid "University"
 msgstr "Ülikool"
@@ -15512,10 +15871,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2115
+#: build/trans_presets.java:2116
 msgid "Edit University"
 msgstr "Vali ülikool"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2120
 msgid "College"
 msgstr "Kolledž"
@@ -15523,5 +15882,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2121
+#: build/trans_presets.java:2122
 msgid "Edit College"
 msgstr "Vale kolledž"
@@ -15529,5 +15888,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2126
+#: build/trans_presets.java:2127
 msgid "Cinema"
 msgstr "Kino"
@@ -15536,10 +15895,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2129
+#: build/trans_presets.java:2130
 msgid "Edit Cinema"
 msgstr "Vali kino"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2133
+#: build/trans_presets.java:2134
 msgid "Library"
 msgstr "Raamatukogu"
@@ -15548,10 +15907,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2136
+#: build/trans_presets.java:2137
 msgid "Edit Library"
 msgstr "Vali raamatukogu"
 
 #. item "Buildings/Library" text "Name"
-#: build/trans_presets.java:2140
+#: build/trans_presets.java:2141
 msgid "Arts Centre"
 msgstr ""
@@ -15559,10 +15918,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2143
 msgid "Edit Arts Centre"
 msgstr ""
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2146
+#: build/trans_presets.java:2147
 msgid "Theatre"
 msgstr "Teater"
@@ -15571,10 +15930,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2150
 msgid "Edit Theatre"
 msgstr "Vali teater"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2154
 msgid "Place of Worship"
 msgstr ""
@@ -15584,5 +15943,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2157
+#: build/trans_presets.java:2158
 msgid "Edit Place of Worship"
 msgstr ""
@@ -15591,6 +15950,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2160 build/trans_presets.java:2881
-#: build/trans_presets.java:2890
+#: build/trans_presets.java:2161 build/trans_presets.java:2882
+#: build/trans_presets.java:2891
 msgid "Religion"
 msgstr "Religioon"
@@ -15599,66 +15958,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2160 build/trans_presets.java:2881
-#: build/trans_presets.java:2890
+#: build/trans_presets.java:2161 build/trans_presets.java:2882
+#: build/trans_presets.java:2891
 msgid "bahai"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2881
-#: build/trans_presets.java:2890
+#: build/trans_presets.java:2161 build/trans_presets.java:2882
+#: build/trans_presets.java:2891
 msgid "buddhist"
 msgstr "budist"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2881
-#: build/trans_presets.java:2890
+#: build/trans_presets.java:2161 build/trans_presets.java:2882
+#: build/trans_presets.java:2891
 msgid "christian"
 msgstr "kristlane"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2881
-#: build/trans_presets.java:2890
+#: build/trans_presets.java:2161 build/trans_presets.java:2882
+#: build/trans_presets.java:2891
 msgid "hindu"
 msgstr "hindu"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2881
-#: build/trans_presets.java:2890
+#: build/trans_presets.java:2161 build/trans_presets.java:2882
+#: build/trans_presets.java:2891
 msgid "jain"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2881
-#: build/trans_presets.java:2890
+#: build/trans_presets.java:2161 build/trans_presets.java:2882
+#: build/trans_presets.java:2891
 msgid "jewish"
 msgstr "juudi"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2881
-#: build/trans_presets.java:2890
+#: build/trans_presets.java:2161 build/trans_presets.java:2882
+#: build/trans_presets.java:2891
 msgid "muslim"
 msgstr "moslem"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2881
-#: build/trans_presets.java:2890
+#: build/trans_presets.java:2161 build/trans_presets.java:2882
+#: build/trans_presets.java:2891
 msgid "sikh"
 msgstr "sikh"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2881
-#: build/trans_presets.java:2890
+#: build/trans_presets.java:2161 build/trans_presets.java:2882
+#: build/trans_presets.java:2891
 msgid "spiritualist"
 msgstr "spiritualist"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2881
-#: build/trans_presets.java:2890
+#: build/trans_presets.java:2161 build/trans_presets.java:2882
+#: build/trans_presets.java:2891
 msgid "taoist"
 msgstr "taoist"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2881
-#: build/trans_presets.java:2890
+#: build/trans_presets.java:2161 build/trans_presets.java:2882
+#: build/trans_presets.java:2891
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2881
-#: build/trans_presets.java:2890
+#: build/trans_presets.java:2161 build/trans_presets.java:2882
+#: build/trans_presets.java:2891
 msgid "zoroastrian"
 msgstr "zoroastrism (muinaspärslaste usund)"
 
-#: build/trans_presets.java:2161 build/trans_presets.java:2882
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:2162 build/trans_presets.java:2883
+#: build/trans_presets.java:2892
 msgid "Denomination"
 msgstr "Usutunnistus"
@@ -15667,81 +16026,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2161 build/trans_presets.java:2882
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:2162 build/trans_presets.java:2883
+#: build/trans_presets.java:2892
 msgid "anglican"
 msgstr "anglikaan"
 
-#: build/trans_presets.java:2161 build/trans_presets.java:2882
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:2162 build/trans_presets.java:2883
+#: build/trans_presets.java:2892
 msgid "baptist"
 msgstr "baptist"
 
-#: build/trans_presets.java:2161 build/trans_presets.java:2882
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:2162 build/trans_presets.java:2883
+#: build/trans_presets.java:2892
 msgid "catholic"
 msgstr "katoliku"
 
-#: build/trans_presets.java:2161 build/trans_presets.java:2882
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:2162 build/trans_presets.java:2883
+#: build/trans_presets.java:2892
 msgid "evangelical"
 msgstr "evangeelne"
 
-#: build/trans_presets.java:2161 build/trans_presets.java:2882
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:2162 build/trans_presets.java:2883
+#: build/trans_presets.java:2892
 msgid "jehovahs_witness"
 msgstr "jehoova_tunnistajad"
 
-#: build/trans_presets.java:2161 build/trans_presets.java:2882
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:2162 build/trans_presets.java:2883
+#: build/trans_presets.java:2892
 msgid "lutheran"
 msgstr "luterlane"
 
-#: build/trans_presets.java:2161 build/trans_presets.java:2882
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:2162 build/trans_presets.java:2883
+#: build/trans_presets.java:2892
 msgid "methodist"
 msgstr "metodist"
 
-#: build/trans_presets.java:2161 build/trans_presets.java:2882
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:2162 build/trans_presets.java:2883
+#: build/trans_presets.java:2892
 msgid "mormon"
 msgstr "mormoon"
 
-#: build/trans_presets.java:2161 build/trans_presets.java:2882
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:2162 build/trans_presets.java:2883
+#: build/trans_presets.java:2892
 msgid "orthodox"
 msgstr "ortodoksne"
 
-#: build/trans_presets.java:2161 build/trans_presets.java:2882
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:2162 build/trans_presets.java:2883
+#: build/trans_presets.java:2892
 msgid "pentecostal"
 msgstr "nelipühalane"
 
-#: build/trans_presets.java:2161 build/trans_presets.java:2882
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:2162 build/trans_presets.java:2883
+#: build/trans_presets.java:2892
 msgid "presbyterian"
 msgstr "presbüterlane"
 
-#: build/trans_presets.java:2161 build/trans_presets.java:2882
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:2162 build/trans_presets.java:2883
+#: build/trans_presets.java:2892
 msgid "protestant"
 msgstr "protestantlik"
 
-#: build/trans_presets.java:2161 build/trans_presets.java:2882
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:2162 build/trans_presets.java:2883
+#: build/trans_presets.java:2892
 msgid "quaker"
 msgstr "kveeker"
 
-#: build/trans_presets.java:2161 build/trans_presets.java:2882
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:2162 build/trans_presets.java:2883
+#: build/trans_presets.java:2892
 msgid "shia"
 msgstr ""
 
-#: build/trans_presets.java:2161 build/trans_presets.java:2882
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:2162 build/trans_presets.java:2883
+#: build/trans_presets.java:2892
 msgid "sunni"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2165
 msgid "Addresses"
 msgstr "Aadressid"
@@ -15750,5 +16109,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2168
 msgid "Edit Address Information"
 msgstr "Vali aadressi infot"
@@ -15756,5 +16115,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2169
+#: build/trans_presets.java:2170
 msgid "House number"
 msgstr "Maja number"
@@ -15762,20 +16121,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2172
 msgid "House name"
 msgstr "Maja nimi"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2174
 msgid "City name"
 msgstr "Linna nimi"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2174
+#: build/trans_presets.java:2175
 msgid "Post code"
 msgstr "Posti kood"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2176
 msgid "Country code"
 msgstr "Riigi kood"
@@ -15783,5 +16142,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2179
 msgid "Address Interpolation"
 msgstr ""
@@ -15790,5 +16149,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2181
+#: build/trans_presets.java:2182
 msgid "Edit Address Interpolation"
 msgstr ""
@@ -15796,71 +16155,71 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2184
 msgid "Numbering scheme"
 msgstr ""
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2184
 msgid "odd"
 msgstr "paaritu"
 
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2184
 msgid "even"
 msgstr "tasane"
 
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2184
 msgid "all"
 msgstr "kõik"
 
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2184
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2187
 msgid "Man Made"
 msgstr "Inimtekkeline"
 
 #. group "Man Made"
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2188
 msgid "Works"
 msgstr "Töökojad"
 
 #. item
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2189
 msgid "Edit Works"
 msgstr "Vali töökojad"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2193
 msgid "Tower"
 msgstr "Torn"
 
 #. item
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2194
 msgid "Edit Tower"
 msgstr "Vali torn"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2198
 msgid "Water Tower"
 msgstr "Veetorn"
 
 #. item
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2199
 msgid "Edit Water Tower"
 msgstr "Vali veetorn"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2203
 msgid "Gasometer"
 msgstr "Gaasimahuti"
 
 #. item
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2204
 msgid "Edit Gasometer"
 msgstr "Vali gaasimahuti"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2207
+#: build/trans_presets.java:2208
 msgid "Lighthouse"
 msgstr "Majakas"
@@ -15868,10 +16227,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2210
 msgid "Edit Lighthouse"
 msgstr "Vali majakas"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2214
 msgid "Windmill"
 msgstr "Tuuleveski"
@@ -15879,10 +16238,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2215
+#: build/trans_presets.java:2216
 msgid "Edit Windmill"
 msgstr "Vali tuuleveski"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2220
 msgid "Pipeline"
 msgstr "Torustik"
@@ -15890,10 +16249,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
-#: build/trans_presets.java:2221
+#: build/trans_presets.java:2222
 msgid "Edit Pipeline"
 msgstr "Vali torustik"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2225
+#: build/trans_presets.java:2226
 msgid "Wastewater Plant"
 msgstr ""
@@ -15903,10 +16262,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2230
 msgid "Edit Wastewater Plant"
 msgstr ""
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2233
+#: build/trans_presets.java:2234
 msgid "Crane"
 msgstr "Kraana"
@@ -15914,10 +16273,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2235
+#: build/trans_presets.java:2236
 msgid "Edit Crane"
 msgstr "Vali kraana"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2239
+#: build/trans_presets.java:2240
 msgid "Beacon"
 msgstr "Tuletorn"
@@ -15925,10 +16284,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2241
+#: build/trans_presets.java:2242
 msgid "Edit Beacon"
 msgstr "Vali tuletorn"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2245
+#: build/trans_presets.java:2246
 msgid "Survey Point"
 msgstr "Geodeetiline punkt"
@@ -15936,10 +16295,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2247
+#: build/trans_presets.java:2248
 msgid "Edit Survey Point"
 msgstr "Vali ülevaatlus punkt"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2252
 msgid "Surveillance"
 msgstr "järelvalve"
@@ -15947,5 +16306,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2254
 msgid "Edit Surveillance Camera"
 msgstr "Vali järelvalve kaamera"
@@ -15953,5 +16312,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2258
+#: build/trans_presets.java:2259
 msgid "Power Generator"
 msgstr "Elektri generaator"
@@ -15961,39 +16320,39 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2263
 msgid "Edit Power Generator"
 msgstr "Vali elektri generaator"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "wind"
 msgstr "tuul"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "hydro"
 msgstr "vesi"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "fossil"
 msgstr "fosiil"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "nuclear"
 msgstr "aatom"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "coal"
 msgstr "süsi"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "photovoltaic"
 msgstr ""
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "gas"
 msgstr "gaas"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2268
 msgid "Power Station"
 msgstr "Elektrijaam"
@@ -16002,10 +16361,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2270
+#: build/trans_presets.java:2271
 msgid "Edit Power Station"
 msgstr "Vali eliektrijaam"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2274
+#: build/trans_presets.java:2275
 msgid "Power Sub Station"
 msgstr "Elektri alajaam"
@@ -16014,5 +16373,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2278
 msgid "Edit Power Sub Station"
 msgstr "Vali elektri alajaam"
@@ -16020,10 +16379,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2280 build/trans_presets.java:2296
+#: build/trans_presets.java:2281 build/trans_presets.java:2297
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2282
+#: build/trans_presets.java:2283
 msgid "Power Tower"
 msgstr ""
@@ -16034,5 +16393,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2288
 msgid "Edit Power Tower"
 msgstr ""
@@ -16040,5 +16399,5 @@
 #. item "Man Made/Power Tower" label "Edit Power Tower"
 #. <key key="power" value="tower" />
-#: build/trans_presets.java:2290
+#: build/trans_presets.java:2291
 msgid "Power Line"
 msgstr ""
@@ -16047,25 +16406,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2294
 msgid "Edit Power Line"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2298
 msgid "Voltage"
 msgstr "Pinge"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2299
 msgid "Amount of Wires"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2301
+#: build/trans_presets.java:2302
 msgid "Amenities"
 msgstr ""
 
 #. group "Amenities"
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2303
 msgid "Toilets"
 msgstr "Tualetid"
@@ -16073,20 +16432,20 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:2307 build/trans_presets.java:2399
+#: build/trans_presets.java:2308 build/trans_presets.java:2400
 msgid "Reference number"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2309 build/trans_presets.java:2400
+#: build/trans_presets.java:2310 build/trans_presets.java:2401
 msgid "Note"
 msgstr "Märkus"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2312
 msgid "Post Box"
 msgstr ""
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2317
 msgid "Telephone"
 msgstr "Telefon"
@@ -16095,5 +16454,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2320
 msgid "Edit Telephone"
 msgstr ""
@@ -16101,5 +16460,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2322 build/trans_presets.java:2401
+#: build/trans_presets.java:2323 build/trans_presets.java:2402
 msgid "Coins"
 msgstr "Mündid"
@@ -16107,5 +16466,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2323 build/trans_presets.java:2402
+#: build/trans_presets.java:2324 build/trans_presets.java:2403
 msgid "Notes"
 msgstr "Märkused"
@@ -16113,5 +16472,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2324 build/trans_presets.java:2403
+#: build/trans_presets.java:2325 build/trans_presets.java:2404
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -16119,5 +16478,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2325 build/trans_presets.java:2404
+#: build/trans_presets.java:2326 build/trans_presets.java:2405
 msgid "Debit cards"
 msgstr "Debet kaart"
@@ -16125,15 +16484,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2326 build/trans_presets.java:2405
+#: build/trans_presets.java:2327 build/trans_presets.java:2406
 msgid "Credit cards"
 msgstr "Krediit kaart"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2328
 msgid "Telephone cards"
 msgstr "Telefoni kaart"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2330
 msgid "Recycling"
 msgstr "Jäätmekäitlus"
@@ -16142,5 +16501,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2333
 msgid "Edit Recycling station"
 msgstr "Muuda jäätmekäitlusjaam"
@@ -16148,35 +16507,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2335
 msgid "Batteries"
 msgstr "Battareid"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2336
 msgid "Cans"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2337
 msgid "Clothes"
 msgstr "Riided"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2338
 msgid "Glass"
 msgstr "Klaas"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2339
 msgid "Paper"
 msgstr "Paber"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2340
 msgid "Scrap Metal"
 msgstr "Vanaraud"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2342
 msgid "Bench"
 msgstr ""
@@ -16185,20 +16544,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2346
 msgid "Hunting Stand"
 msgstr "Jahikantsel"
 
 #. item
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2347
 msgid "Edit Hunting Stand"
 msgstr "Muuda jahiala"
 
 #. item "Amenities/Hunting Stand" check "Shelter"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2350
 msgid "Hide"
 msgstr "Peida"
 
 #. item "Amenities/Hunting Stand" check "Hide"
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2351
 msgid "Lock"
 msgstr "Lukusta"
@@ -16206,22 +16565,22 @@
 #. item "Amenities/Hunting Stand" check "Lock"
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2351 build/trans_presets.java:2751
+#: build/trans_presets.java:2352 build/trans_presets.java:2752
 msgid "Height"
 msgstr "Kõrgus"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2351
+#: build/trans_presets.java:2352
 msgid "low"
 msgstr "madal"
 
-#: build/trans_presets.java:2351
+#: build/trans_presets.java:2352
 msgid "half"
 msgstr "pool"
 
-#: build/trans_presets.java:2351
+#: build/trans_presets.java:2352
 msgid "full"
 msgstr "täis"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2354
 msgid "Fountain"
 msgstr "Purskaev"
@@ -16230,10 +16589,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2357
 msgid "Edit Fountain"
 msgstr "Vali purskaev"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2361
 msgid "Drinking Water"
 msgstr "Joogi vesi"
@@ -16242,10 +16601,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2363
+#: build/trans_presets.java:2364
 msgid "Edit Drinking Water"
 msgstr "Vali joogi vee asukoht"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2367
+#: build/trans_presets.java:2368
 msgid "Baby Hatch"
 msgstr ""
@@ -16253,25 +16612,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2369
+#: build/trans_presets.java:2370
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2375
+#: build/trans_presets.java:2376
 msgid "Shops"
 msgstr "Poed"
 
 #. group "Shops"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2377
 msgid "Supermarket"
 msgstr "Supermarket"
 
 #. item
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2378
 msgid "Edit Supermarket"
 msgstr "Vali Supermarket"
 
 #. item "Shops/Supermarket" text "Name"
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:2382
 msgid "Convenience Store"
 msgstr ""
@@ -16279,10 +16638,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2384
 msgid "Edit Convenience Store"
 msgstr ""
 
 #. item "Shops/Convenience Store" text "Name"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2388
 msgid "Kiosk"
 msgstr "Kiosk"
@@ -16290,10 +16649,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2390
 msgid "Edit Kiosk"
 msgstr "Vali kiosk"
 
 #. item "Shops/Kiosk" text "Name"
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2394
 msgid "Vending machine"
 msgstr ""
@@ -16301,5 +16660,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2396
 msgid "Edit Vending machine"
 msgstr ""
@@ -16307,88 +16666,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "Vending products"
 msgstr ""
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "public_transport_tickets"
 msgstr "ühistranspordi_piletid"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "public_transport_plans"
 msgstr "ühistranspordi_plaanid"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "parking_tickets"
 msgstr "parkimis_pilet"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "food"
 msgstr "toit"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "drinks"
 msgstr "joogid"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "sweets"
 msgstr "maiustused"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "cigarettes"
 msgstr "suitsud"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "photos"
 msgstr "fotod"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "animal_food"
 msgstr "looma_toit"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "news_papers"
 msgstr "ajalehed"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "toys"
 msgstr "mänguasjad"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "stamps"
 msgstr "templid"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "SIM-cards"
 msgstr "SIM-kaardid"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "telephone_vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "condoms"
 msgstr "ckondoomid"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "tampons"
 msgstr "tampoonid"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "excrement_bags"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2407
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2408
+#: build/trans_presets.java:2409
 msgid "Butcher"
 msgstr "Lihunik"
@@ -16396,10 +16755,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2411
 msgid "Edit Butcher"
 msgstr "Vali lihunik"
 
 #. item "Shops/Butcher" text "Name"
-#: build/trans_presets.java:2414
+#: build/trans_presets.java:2415
 msgid "Baker"
 msgstr "Pagar"
@@ -16407,10 +16766,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2417
 msgid "Edit Baker"
 msgstr "Vali pagar"
 
 #. item "Shops/Baker" text "Name"
-#: build/trans_presets.java:2420
+#: build/trans_presets.java:2421
 msgid "Florist"
 msgstr "Lilleseadja"
@@ -16418,20 +16777,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2423
 msgid "Edit Florist"
 msgstr "Vali lilleseadja"
 
 #. item "Shops/Florist" text "Name"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2427
 msgid "Organic"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2427
+#: build/trans_presets.java:2428
 msgid "Edit Organic Shop"
 msgstr ""
 
 #. item "Shops/Organic" text "Name"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2432
 msgid "Alcohol"
 msgstr ""
@@ -16439,60 +16798,60 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2433
+#: build/trans_presets.java:2434
 msgid "Edit Alcohol Shop"
 msgstr ""
 
 #. item "Shops/Alcohol" text "Name"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2438
 msgid "Beverages"
 msgstr "Joogi pood"
 
 #. item
-#: build/trans_presets.java:2438
+#: build/trans_presets.java:2439
 msgid "Edit Beverages Shop"
 msgstr ""
 
 #. item "Shops/Beverages" text "Name"
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:2443
 msgid "Computer"
 msgstr "Arvuti"
 
 #. item
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2444
 msgid "Edit Computer Shop"
 msgstr "Vali arvuti pood"
 
 #. item "Shops/Computer" text "Name"
-#: build/trans_presets.java:2447
+#: build/trans_presets.java:2448
 msgid "Electronics"
 msgstr "Elektroonika"
 
 #. item
-#: build/trans_presets.java:2448
+#: build/trans_presets.java:2449
 msgid "Edit Electronics Shop"
 msgstr "Vali elktroonika pood"
 
 #. item "Shops/Electronics" text "Name"
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2453
 msgid "Hifi"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2454
 msgid "Edit Hifi Shop"
 msgstr ""
 
 #. item "Shops/Hifi" text "Name"
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2458
 msgid "Furniture"
 msgstr "Mööbel"
 
 #. item
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2459
 msgid "Edit Furniture Shop"
 msgstr "Vali mööblipood"
 
 #. item "Shops/Furniture" text "Name"
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2463
 msgid "Garden Centre"
 msgstr "Aia keskus"
@@ -16500,10 +16859,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2465
 msgid "Edit Garden Centre"
 msgstr "Vali aia keskus"
 
 #. item "Shops/Garden Centre" text "Name"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2469
 msgid "Hardware"
 msgstr "Riistvara"
@@ -16511,10 +16870,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2471
 msgid "Edit Hardware Store"
 msgstr "Vali riistvara pood"
 
 #. item "Shops/Hardware" text "Name"
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2475
 msgid "Do-it-yourself-store"
 msgstr ""
@@ -16522,60 +16881,60 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2477
 msgid "Edit Do-it-yourself-store"
 msgstr ""
 
 #. item "Shops/Do-it-yourself-store" text "Name"
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2481
 msgid "Stationery"
 msgstr "Kirjatarbed"
 
 #. item
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2482
 msgid "Edit Stationery Shop"
 msgstr "Vali kirjatarvete pood"
 
 #. item "Shops/Stationery" text "Name"
-#: build/trans_presets.java:2485
+#: build/trans_presets.java:2486
 msgid "Hairdresser"
 msgstr "Juuksur"
 
 #. item
-#: build/trans_presets.java:2486
+#: build/trans_presets.java:2487
 msgid "Edit Hairdresser"
 msgstr "Vali juuksur"
 
 #. item "Shops/Hairdresser" text "Name"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2491
 msgid "Shoes"
 msgstr "Jalatsid"
 
 #. item
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2492
 msgid "Edit Shoe Shop"
 msgstr "Vali jalatsi pood"
 
 #. item "Shops/Shoes" text "Name"
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2496
 msgid "Toys"
 msgstr "Mänguasjad"
 
 #. item
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2497
 msgid "Edit Toy Shop"
 msgstr "Vali mänguasja pood"
 
 #. item "Shops/Toys" text "Name"
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2501
 msgid "Video"
 msgstr "Video"
 
 #. item
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2502
 msgid "Edit Video Shop"
 msgstr "Vali video pood"
 
 #. item "Shops/Video" text "Name"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2506
 msgid "Dry Cleaning"
 msgstr "Kuiir puhastus"
@@ -16583,10 +16942,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2507
+#: build/trans_presets.java:2508
 msgid "Edit Dry Cleaning"
 msgstr "Vali kiirpuhastus"
 
 #. item "Shops/Dry Cleaning" text "Name"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2512
 msgid "Laundry"
 msgstr "Pesumaja"
@@ -16594,10 +16953,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:2514
 msgid "Edit Laundry"
 msgstr "Vali pesumaja"
 
 #. item "Shops/Laundry" text "Name"
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2518
 msgid "Outdoor"
 msgstr "Välisuks"
@@ -16605,35 +16964,35 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2520
 msgid "Edit Outdoor Shop"
 msgstr "Vali välisukse pood"
 
 #. item "Shops/Outdoor" text "Name"
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2524
 msgid "Sports"
 msgstr "Sport"
 
 #. item
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2525
 msgid "Edit Sports Shop"
 msgstr "Vali spordi pood"
 
 #. item "Shops/Sports" text "Name"
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2529
 msgid "Optician"
 msgstr "Optik"
 
 #. item
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2530
 msgid "Edit Optician"
 msgstr "Vali optika"
 
 #. item "Shops/Optician" text "Name"
-#: build/trans_presets.java:2535
+#: build/trans_presets.java:2536
 msgid "Cash"
 msgstr "Sularaha"
 
 #. group "Cash"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2537
 msgid "Bank"
 msgstr "Pank"
@@ -16641,5 +17000,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2539
 msgid "Edit Bank"
 msgstr "Vali Pank"
@@ -16647,10 +17006,10 @@
 #. item "Cash/Bank" text "Name"
 #. item "Cash/Money Exchange" text "Name"
-#: build/trans_presets.java:2541 build/trans_presets.java:2549
+#: build/trans_presets.java:2542 build/trans_presets.java:2550
 msgid "Automated Teller Machine"
 msgstr "Sularaha automaat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2544
 msgid "Money Exchange"
 msgstr "Raha vahetus"
@@ -16658,5 +17017,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2546
 msgid "Edit Money Exchange"
 msgstr "Vali raha vahetus punkt"
@@ -16664,15 +17023,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2552
 msgid "Edit Automated Teller Machine"
 msgstr "Vali sularaha automaat"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2557
 msgid "Health"
 msgstr "Tervis"
 
 #. group "Health"
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2558
 msgid "Doctors"
 msgstr "Arstid"
@@ -16680,20 +17039,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2560
 msgid "Edit Doctors"
 msgstr "Vali arstid"
 
 #. item "Health/Doctors" text "Name"
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2564
 msgid "Dentist"
 msgstr "Hambaarst"
 
 #. item
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2565
 msgid "Edit Dentist"
 msgstr "Vali hambaarst"
 
 #. item "Health/Dentist" text "Name"
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2569
 msgid "Pharmacy"
 msgstr "Apteek"
@@ -16701,5 +17060,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2570
+#: build/trans_presets.java:2571
 msgid "Edit Pharmacy"
 msgstr "Vali Apteek"
@@ -16707,10 +17066,10 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2573
 msgid "Dispensing"
 msgstr "Retseptuur"
 
 #. item "Health/Pharmacy" text "Name"
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2576
 msgid "Hospital"
 msgstr "Haigla"
@@ -16718,10 +17077,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2577
+#: build/trans_presets.java:2578
 msgid "Edit Hospital"
 msgstr "Vali haigla"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2582
 msgid "Emergency Access Point"
 msgstr "Hädaabi tugijaam"
@@ -16730,5 +17089,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2585
 msgid "Edit Emergency Access Point"
 msgstr "Vali hädaabi tugijaam"
@@ -16737,20 +17096,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2588
 msgid "Point Number"
 msgstr "Punkti number"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2589
 msgid "Point Name"
 msgstr "Punkti nimi"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2591
 msgid "Phone Number"
 msgstr "Telefoninumber"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2592
 msgid "(Use international code, like +12-345-67890)"
 msgstr ""
@@ -16758,5 +17117,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2594
+#: build/trans_presets.java:2595
 msgid "Veterinary"
 msgstr "Loomaarst"
@@ -16765,25 +17124,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2598
 msgid "Edit Veterinary"
 msgstr "Vali loomaarst"
 
 #. group "Places"
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2605
 msgid "Continent"
 msgstr "Kontinent"
 
 #. item
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2606
 msgid "Edit Continent"
 msgstr "Vali kontinent"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2611
 msgid "Country"
 msgstr "Maa"
 
 #. item
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2612
 msgid "Edit Country"
 msgstr "Vali maa"
@@ -16791,30 +17150,30 @@
 #. item "Places/Country" text "Name"
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:2616 build/trans_presets.java:3001
+#: build/trans_presets.java:2617 build/trans_presets.java:3002
 msgid "State"
 msgstr "Riik"
 
 #. item
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2618
 msgid "Edit State"
 msgstr "Vali riik"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2622
+#: build/trans_presets.java:2623
 msgid "Region"
 msgstr "Regioon"
 
 #. item
-#: build/trans_presets.java:2623
+#: build/trans_presets.java:2624
 msgid "Edit Region"
 msgstr "Vali regioon"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2628
+#: build/trans_presets.java:2629
 msgid "County"
 msgstr "Maakond"
 
 #. item
-#: build/trans_presets.java:2629
+#: build/trans_presets.java:2630
 msgid "Edit County"
 msgstr "Vali maakond"
@@ -16822,15 +17181,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2635
+#: build/trans_presets.java:2636
 msgid "City"
 msgstr "Linn"
 
 #. item
-#: build/trans_presets.java:2636
+#: build/trans_presets.java:2637
 msgid "Edit City"
 msgstr "Vali linn"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2641
+#: build/trans_presets.java:2642
 msgid "Town"
 msgstr "Linn"
@@ -16838,10 +17197,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2644
 msgid "Edit Town"
 msgstr "Muuda linna"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2649
 msgid "Suburb"
 msgstr "Linnaosa"
@@ -16849,25 +17208,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2651
 msgid "Edit Suburb"
 msgstr "Muuda linnaosa"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2656
 msgid "Village"
 msgstr "Küla"
 
 #. item
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2657
 msgid "Edit Village"
 msgstr "Muuda küla"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2662
 msgid "Hamlet"
 msgstr "Külake"
 
 #. item
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2663
 msgid "Edit Hamlet"
 msgstr "Muuda külakest"
@@ -16875,5 +17234,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2669
 msgid "Locality"
 msgstr "Asustamata koht"
@@ -16881,10 +17240,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2670
+#: build/trans_presets.java:2671
 msgid "Edit Locality"
 msgstr "Muuda asustamata kohta"
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2676
 msgid "Island"
 msgstr "Saar"
@@ -16892,5 +17251,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2678
 msgid "Edit Island"
 msgstr "Muuda saart"
@@ -16898,5 +17257,5 @@
 #. item "Places/Island" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2683
+#: build/trans_presets.java:2684
 msgid "Cave Entrance"
 msgstr "Koobas"
@@ -16904,10 +17263,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2685
+#: build/trans_presets.java:2686
 msgid "Edit Cave Entrance"
 msgstr "Muuda koobast"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2690
 msgid "Peak"
 msgstr "Mäetipp"
@@ -16915,10 +17274,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2691
+#: build/trans_presets.java:2692
 msgid "Edit Peak"
 msgstr "Muuda mäetippu"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2697
 msgid "Glacier"
 msgstr "Liustik"
@@ -16926,10 +17285,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2699
 msgid "Edit Glacier"
 msgstr "Muuda liustikku"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2703
+#: build/trans_presets.java:2704
 msgid "Volcano"
 msgstr "Vulkaan"
@@ -16937,70 +17296,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2705
+#: build/trans_presets.java:2706
 msgid "Edit Volcano"
 msgstr "Muuda vulkaani"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2711
+#: build/trans_presets.java:2712
 msgid "Boundaries"
 msgstr "Piirid"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2713
 msgid "National"
 msgstr "Riiklikud"
 
 #. item
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2714
 msgid "Edit National Boundary"
 msgstr "Muuda riiklikke piire"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2718
+#: build/trans_presets.java:2719
 msgid "Administrative"
 msgstr "Administratiivpiir"
 
 #. item
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2720
 msgid "Edit Administrative Boundary"
 msgstr "Muuda administratiivpiire"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2724
+#: build/trans_presets.java:2725
 msgid "Civil"
 msgstr "Omavalitsus"
 
 #. item
-#: build/trans_presets.java:2725
+#: build/trans_presets.java:2726
 msgid "Edit Civil Boundary"
 msgstr "Muuda omavalitsuse piire"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2730
+#: build/trans_presets.java:2731
 msgid "Political"
 msgstr "Valimisringkond"
 
 #. item
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:2732
 msgid "Edit Political Boundary"
 msgstr "Muuda valimisringkonda"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2736
+#: build/trans_presets.java:2737
 msgid "National park"
 msgstr "Rahvuspark"
 
 #. item
-#: build/trans_presets.java:2737
+#: build/trans_presets.java:2738
 msgid "Edit National Park Boundary"
 msgstr "Muuda rahvuspargi piire"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2744
 msgid "Land use"
 msgstr "Maakasutus"
 
 #. group "Land use"
-#: build/trans_presets.java:2744
+#: build/trans_presets.java:2745
 msgid "Tree"
 msgstr "Üksik puu"
@@ -17009,15 +17368,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2748
 msgid "Edit Tree"
 msgstr "Muuda puud"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2753
 msgid "Botanical Name"
 msgstr "Botaaniline nimi"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2755
 msgid "Wood"
 msgstr "Mets"
@@ -17026,5 +17385,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2758
 msgid "Edit Wood"
 msgstr "Muuda metsa"
@@ -17032,17 +17391,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2760 build/trans_presets.java:2769
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
 msgid "coniferous"
 msgstr "okasmets"
 
-#: build/trans_presets.java:2760 build/trans_presets.java:2769
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
 msgid "deciduous"
 msgstr "lehtmets"
 
-#: build/trans_presets.java:2760 build/trans_presets.java:2769
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
 msgid "mixed"
 msgstr "segamets"
 
-#: build/trans_presets.java:2762
+#: build/trans_presets.java:2763
 msgid "Forest"
 msgstr "Kultuurmets"
@@ -17051,14 +17410,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2765
+#: build/trans_presets.java:2766
 msgid "Edit Forest Landuse"
 msgstr "Muuda kultuurmetsa"
 
-#: build/trans_presets.java:2771
+#: build/trans_presets.java:2772
 msgid "Nature Reserve"
 msgstr "Looduskaitseala"
 
 #. item
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2773
 msgid "Edit Nature Reserve"
 msgstr "Muuda looduskaitseala"
@@ -17066,25 +17425,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2777
+#: build/trans_presets.java:2778
 msgid "Scree"
 msgstr "klibu, rusukalle"
 
 #. item
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:2779
 msgid "Edit Scree"
 msgstr "Muuda rusukallet"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2783
 msgid "Scrub"
 msgstr "Võsa"
 
 #. item
-#: build/trans_presets.java:2783
+#: build/trans_presets.java:2784
 msgid "Edit Scrub"
 msgstr "Muuda võsa"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2788
 msgid "Fell"
 msgstr "Langus"
@@ -17092,10 +17451,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2789
+#: build/trans_presets.java:2790
 msgid "Edit Fell"
 msgstr "Muuda langust"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2794
 msgid "Heath"
 msgstr "Nõmm"
@@ -17103,5 +17462,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2795
+#: build/trans_presets.java:2796
 msgid "Edit Heath"
 msgstr "Muuda nõmme"
@@ -17109,5 +17468,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2801
 msgid "Farmyard"
 msgstr "Taluõu"
@@ -17116,45 +17475,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:2803
+#: build/trans_presets.java:2804
 msgid "Edit Farmyard Landuse"
 msgstr "Muuda taluõue"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2808
+#: build/trans_presets.java:2809
 msgid "Farmland"
 msgstr "Talumaa"
 
 #. item
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2810
 msgid "Edit Farmland Landuse"
 msgstr "Muuda talumaad"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2814
+#: build/trans_presets.java:2815
 msgid "Meadow"
 msgstr "Niit"
 
 #. item
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2816
 msgid "Edit Meadow Landuse"
 msgstr "Muuta niitu"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2820
+#: build/trans_presets.java:2821
 msgid "Vineyard"
 msgstr "Viinapuuistandus"
 
 #. item
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2822
 msgid "Edit Vineyard Landuse"
 msgstr "Muuda viinapuuistandust"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2826
+#: build/trans_presets.java:2827
 msgid "Allotments"
 msgstr "Eraldised"
 
 #. item
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:2828
 msgid "Edit Allotments Landuse"
 msgstr "Muuda eraldisi"
@@ -17162,25 +17521,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2833
+#: build/trans_presets.java:2834
 msgid "Garden"
 msgstr "Aed"
 
 #. item
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2835
 msgid "Edit Garden"
 msgstr "Muuda aeda"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2838
+#: build/trans_presets.java:2839
 msgid "Grass"
 msgstr "Muru"
 
 #. item
-#: build/trans_presets.java:2839
+#: build/trans_presets.java:2840
 msgid "Edit Grass Landuse"
 msgstr "Muuda muru"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2845
 msgid "Village Green"
 msgstr "Külatanum"
@@ -17188,10 +17547,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:2847
 msgid "Edit Village Green Landuse"
 msgstr "Muuda külatanumat"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:2852
 msgid "Common"
 msgstr "Avalik maa"
@@ -17199,20 +17558,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:2854
 msgid "Edit Common"
 msgstr "Muuda avalikku maad"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2858
 msgid "Park"
 msgstr "Park"
 
 #. item
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:2859
 msgid "Edit Park"
 msgstr "Muuda parki"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2863
 msgid "Recreation Ground"
 msgstr "Puhkeala"
@@ -17220,5 +17579,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2865
 msgid "Edit Recreation Ground Landuse"
 msgstr "Muuda puhkeala"
@@ -17226,15 +17585,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2871
 msgid "Residential area"
 msgstr "Elamurajoon"
 
 #. item
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2872
 msgid "Edit Residential Landuse"
 msgstr "Muuda elamurajooni"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2877
 msgid "Graveyard"
 msgstr "Matmispaik"
@@ -17242,9 +17601,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:2879
 msgid "Edit Graveyard"
 msgstr "Muuda matmispaika"
 
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:2885
 msgid "Cemetery"
 msgstr "Kalmistu"
@@ -17252,39 +17611,39 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:2886
+#: build/trans_presets.java:2887
 msgid "Edit Cemetery Landuse"
 msgstr "Muuda kalmistut"
 
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2894
 msgid "Retail"
 msgstr "Kaubandus"
 
 #. item
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2895
 msgid "Edit Retail Landuse"
 msgstr "Muuda kaubandust"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2900
 msgid "Commercial"
 msgstr "Kommerts"
 
 #. item
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2901
 msgid "Edit Commercial Landuse"
 msgstr "Muuda kommertspiirkonda"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2906
 msgid "Industrial"
 msgstr "Tööstus"
 
 #. item
-#: build/trans_presets.java:2906
+#: build/trans_presets.java:2907
 msgid "Edit Industrial Landuse"
 msgstr "Muuda tööstuspiirkonda"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2912
 msgid "Railway land"
 msgstr "Raudtee"
@@ -17292,15 +17651,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:2913
+#: build/trans_presets.java:2914
 msgid "Edit Railway Landuse"
 msgstr "Muuda raudteed"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:2919
 msgid "Military"
 msgstr "Militaarala"
 
 #. item
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2920
 msgid "Edit Military Landuse"
 msgstr "Muuda militaarala"
@@ -17308,55 +17667,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2925
+#: build/trans_presets.java:2926
 msgid "Construction area"
 msgstr "Ehitustanner"
 
 #. item
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2927
 msgid "Edit Construction Landuse"
 msgstr "Muuda ehitustandrit"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2932
 msgid "Brownfield"
 msgstr "Jäätmaa"
 
 #. item
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:2933
 msgid "Edit Brownfield Landuse"
 msgstr "Muuda jäätmaad"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2937
+#: build/trans_presets.java:2938
 msgid "Greenfield"
 msgstr "Roheala"
 
 #. item
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:2939
 msgid "Edit Greenfield Landuse"
 msgstr "Muuda roheala"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:2944
 msgid "Landfill"
 msgstr "Prügimägi"
 
 #. item
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:2945
 msgid "Edit Landfill Landuse"
 msgstr "Muuda prügimäge"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2950
 msgid "Quarry"
 msgstr "Kivimurd"
 
 #. item
-#: build/trans_presets.java:2950
+#: build/trans_presets.java:2951
 msgid "Edit Quarry Landuse"
 msgstr "Muuda kivimurdu"
 
 #. group "Relations"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2960
 msgid "Multipolygon"
 msgstr "Hulknurk"
@@ -17366,5 +17725,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:2963
+#: build/trans_presets.java:2964
 msgid "Edit Multipolygon"
 msgstr "Muuda hulknurka"
@@ -17373,10 +17732,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:2970
 msgid "outer segment"
 msgstr "väline osa"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:2970
+#: build/trans_presets.java:2971
 msgid "inner segment"
 msgstr "siseosa"
@@ -17384,5 +17743,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:2974
 msgid "Turn restriction"
 msgstr "Pöördekeelud"
@@ -17391,5 +17750,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:2976
+#: build/trans_presets.java:2977
 msgid "Edit Turn Restriction"
 msgstr "Muuda pöördekeelde"
@@ -17397,34 +17756,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "Restriction"
 msgstr "Keelud"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_left_turn"
 msgstr "vasakpöörde keeld"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_right_turn"
 msgstr "parempöörde keeld"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_straight_on"
 msgstr "ei tohi otse sõita"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_u_turn"
 msgstr "ei tohi tagasi pöörata"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "only_right_turn"
 msgstr "ainult parempööre"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "only_left_turn"
 msgstr "ainult vaskpööre"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "only_straight_on"
 msgstr "ainult otsesõit"
@@ -17433,15 +17792,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2983
+#: build/trans_presets.java:2984
 msgid "from way"
 msgstr "teelt"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2985
 msgid "via node or way"
 msgstr "üle sõlme või tee"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2986
 msgid "to way"
 msgstr "teele"
@@ -17449,5 +17808,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:2988
+#: build/trans_presets.java:2989
 msgid "Route"
 msgstr "Teekond"
@@ -17456,5 +17815,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:2991
+#: build/trans_presets.java:2992
 msgid "Edit Route"
 msgstr "Muuda teekonda"
@@ -17462,5 +17821,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "Route type"
 msgstr "teekonna tüüp"
@@ -17532,5 +17891,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:2993 build/trans_style.java:209
+#: 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
@@ -17539,17 +17898,17 @@
 msgstr "jalgrattaga"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "bus"
 msgstr "buss"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "road"
 msgstr "tee"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "ferry"
 msgstr "praam"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "ski"
 msgstr "suusad"
@@ -17602,5 +17961,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:2993 build/trans_style.java:223
+#: 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
@@ -17609,13 +17968,13 @@
 msgstr "jalgsi"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "hiking"
 msgstr "matkamine"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "tram"
 msgstr "tramm"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "detour"
 msgstr "ümbersõit"
@@ -17629,10 +17988,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:2993 build/trans_style.java:1163
+#: build/trans_presets.java:2994 build/trans_style.java:1163
 msgid "subway"
 msgstr "metroo"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:2997
 msgid "Symbol description"
 msgstr "sümboolne kirjeldus"
@@ -17640,26 +17999,26 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:2999
+#: build/trans_presets.java:3000
 msgid "Network"
 msgstr "Võrk"
 
 #. item "Relations/Route" combo "State"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "proposed"
 msgstr "planeeritud"
 
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "alternate"
 msgstr "täiendav"
 
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "temporary"
 msgstr "ajutine"
 
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "connection"
 msgstr "ühendus"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3003
 msgid "Color (hex)"
 msgstr "Värv (hex)"
@@ -17668,30 +18027,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:3006
 msgid "route segment"
 msgstr "teekonna osa"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3007
 msgid "forward segment"
 msgstr "edasisuunaline osa"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3008
 msgid "backward segment"
 msgstr "tagasisuunaline osa"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3009
 msgid "halt point"
 msgstr "peatuspunkt"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3010
 msgid "forward halt point"
 msgstr "forward halt point"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3011
 msgid "backward halt point"
 msgstr "backward halt point"
@@ -21806,9 +22165,26 @@
 msgstr ""
 
+#~ 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 "Uploading data"
 #~ msgstr "Andmete üles laadimine"
 
+#~ msgid "Email"
+#~ msgstr "E-post"
+
+#~ msgid "OSM username (email)"
+#~ msgstr "OSM kasutajanimi (email)"
+
 #~ msgid "Unknown host"
 #~ msgstr "Tundmatu host"
+
+#~ 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}"
@@ -21824,2 +22200,17 @@
 #~ 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 "
+#~ "continue?"
+#~ msgstr "See nõuab {0} allalaadimise palvet. Soovid jätkata?"
+
+#~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">english</A>."
+#~ msgstr "Abileht puudub. Loo see <A HREF=\"{0}\">english</A>."
+
+#~ msgid ""
+#~ "Helppage missing. Create it in <A HREF=\"{0}\">english</A> or <A HREF="
+#~ "\"{1}\">your language</A>."
+#~ msgstr ""
+#~ "Abileht puudub. Loo see <A HREF=\"{0}\">english</A> või <A HREF=\"{1}"
+#~ "\">eesti</A>"
