Index: applications/editors/josm/i18n/po/ar.po
===================================================================
--- applications/editors/josm/i18n/po/ar.po	(revision 16008)
+++ applications/editors/josm/i18n/po/ar.po	(revision 16009)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-14 16:51+0200\n"
-"PO-Revision-Date: 2009-06-09 18:45+0000\n"
-"Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
+"POT-Creation-Date: 2009-06-19 21:52+0200\n"
+"PO-Revision-Date: 2009-06-15 00:01+0000\n"
+"Last-Translator: AtomCell <shelhatem@gmail.com>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -17,5 +17,5 @@
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n % 100 >= "
 "3 && n % 100 <= 10 ? 3 : n % 100 >= 11 && n % 100 <= 99 ? 4 : 5;\n"
-"X-Launchpad-Export-Date: 2009-06-14 14:46+0000\n"
+"X-Launchpad-Export-Date: 2009-06-19 19:35+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -28,12 +28,12 @@
 #: ../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 "المساعدة"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:261
-msgid "The projection could not be read from preferences. Using Mercartor"
-msgstr ""
+msgid "The projection could not be read from preferences. Using Mercator"
+msgstr "الإسقاط لا يمكن أن يقرأ من الأفضليات. باستخدام Mercator"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:349
@@ -71,6 +71,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
@@ -87,8 +89,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
@@ -112,5 +114,5 @@
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
-msgstr ""
+msgstr "تجاهل عنوان  الملف  المشوه : \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:71
@@ -137,5 +139,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"
@@ -530,5 +532,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}"
@@ -598,6 +600,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:92
-msgid "Email"
-msgstr "البريد الإلكتروني"
+msgid "E-Mail"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:96
@@ -635,12 +637,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
@@ -667,5 +671,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
@@ -698,15 +702,13 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:207
 #, java-format
-msgid "Helppage missing. Create it in <A HREF=\"{0}\">english</A>."
-msgstr "صفحة المساعدة مفقودة. إنشائها بِــ <A HREF=\"{0}\">الإنكليزية</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 ""
-"صفحة المساعدة مفقودة. إنشائها بِــ <A HREF=\"{0}\"> الإنكليزية</A> أو <A HREF="
-"\"{1}\">بِلغتك</A>."
 
 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:26
@@ -1122,13 +1124,13 @@
 msgstr "المساعدة: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:99
 msgid "Status Report"
 msgstr "تقرير عن الحالة"
 
-#: ../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 ""
 
-#: ../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
@@ -1317,102 +1319,272 @@
 msgstr ""
 
-#: ../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 "تحديث المعطيات"
 
-#: ../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 ""
 
-#: ../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?"
 msgstr ""
 
-#: ../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 ""
-
-#: ../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 "حمّل إلى أو.أس.أم ..."
 
-#: ../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 "حمّل كل التغييرات إلى الخادم أو.أس.أم ."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:96
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:94
 msgid "Objects to add:"
 msgstr "الأغراض اللتي يجب إضافتها:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102
 msgid "Objects to modify:"
 msgstr "الأغراض اللتي يجب تغييرها:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:110
 msgid "Objects to delete:"
 msgstr "الأغراض اللتي يجب حذفها:"
 
-#: ../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 "الرجاء التزويد ببعض الملاحظات في ما يخص التغييرات اللتي تريد إرسالها:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:126
 msgid "Upload these changes?"
 msgstr "حمّل هذه التغييرات :"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:130
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
 msgid "Upload Changes"
 msgstr "حمّل التغييرات"
 
-#: ../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 "لا شيء للتحميل. إحصل على بعض المعطيات أولاً"
 
-#: ../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 "يوجد تناقضات غير محلولة. يجب عليك حلّ هذه التناقضات أولاً."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:182
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:180
 msgid "No changes to upload."
 msgstr "لا يوجد تغييرات للتحميل."
 
-#: ../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 ""
@@ -1517,37 +1689,51 @@
 msgstr "المعطيات الخام لجهاز نظام تحديد المواقع العالمي"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:44
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:46
 msgid "Downloading data"
 msgstr "جاري تحميل المعطيات"
 
-#: ../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 "لم يتم تحميل أي معطيات"
 
-#: ../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 "طبقة المعطيات {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 "معطيات OpenStreetMap"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:37
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:45
 msgid "Data Layer"
 msgstr "طبقة المعطيات"
 
-#: ../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 "نزل {0} من {1} (باقية {2} )"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:88
-msgid "The following errors occured during mass download:"
-msgstr "حصلت الأخطاء التالية عند التنزيل الضخم:"
-
-#: ../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 "أخطاء عند التنزيل"
+
+#: ../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
@@ -1598,34 +1784,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 "أضافة عقدة"
 
-#: ../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 "إضافة عقدة إلى طريق"
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:500
+msgid "Connect existing way to node"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:502
-msgid "Connect existing way to node"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:504
 msgid "Add a new node to an existing way"
 msgstr "إضافة عقدة جديدة إلى طريق موجودة"
 
-#: ../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 ""
 
-#: ../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 "انشئ عقدة جديدة"
 
-#: ../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 "إختر العقدة الموجودة تحت المزلاق."
 
-#: ../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."
@@ -1634,14 +1820,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 "إبدء طريق جديدة من العقدة الأخيرة."
 
-#: ../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 "تابع طريق من العقدة الأخيرة."
 
-#: ../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 "إنهي الرسم."
@@ -1950,25 +2136,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 "حمّل الخيار"
 
-#: ../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 "إتصل بــ {0}..."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:45
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:46
 msgid "Downloading..."
 msgstr "جاري التنزيل..."
 
-#: ../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 "لم أتمكن من القراءة من الــ URL: \"{0}\""
 
-#: ../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 ""
 
@@ -2031,13 +2223,80 @@
 msgstr "حلّ {0} التناقضات في {1} أغراض"
 
-#: ../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 "أمحي {1} {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97
+#, java-format
+msgid "Delete {0} {1}"
+msgstr "أمحي {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153
+msgid "Conflicting relation"
+msgstr "علاقة متناقضة"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147
+#, java-format
+msgid ""
+"Selection \"{0}\" is used by relation \"{1}\" with role {2}.\n"
+"Delete from relation?"
+msgstr ""
+"الخيار \"{0}\" مستعمل من العلاقة \"{1}\" في الدور {2}.\n"
+"محو من العلاقة ؟"
+
+#: ../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 "حرك"
+
 #: ../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"
@@ -2050,10 +2309,217 @@
 msgstr[5] "عقد"
 
-#: ../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 "التعاقب"
+
+#: ../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 "ملف إعدادات غير صحيح التكوين في الأسطر {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:324
+#, java-format
+msgid "Cannot open preferences directory: {0}"
+msgstr "غير قادر على فتح دليل التفضيلات: {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 "التفضيلات المخزنة على {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:82
+#, java-format
+msgid "Could not upload preferences. Reason: {0}"
+msgstr "لم أتمكن من تحميل التفضيلات. السبب هو : {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:93
+msgid "Could not load preferences from server."
+msgstr "لم أتمكن من تحميل التفضيلات من الخادم."
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:34
+msgid "different"
+msgstr "مختلف"
+
+#: ../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 "خطأ : {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
+#, java-format
+msgid "Warning: {0}"
+msgstr "تحذير: {0}"
+
+#: ../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"
@@ -2066,8 +2532,10 @@
 msgstr[5] "طرقات"
 
-#: ../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
@@ -2082,258 +2550,27 @@
 msgstr[5] "علاقة"
 
-#: ../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 "أمحي {1} {0}"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97
-#, java-format
-msgid "Delete {0} {1}"
-msgstr "أمحي {0} {1}"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153
-msgid "Conflicting relation"
-msgstr "علاقة متناقضة"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147
-#, java-format
-msgid ""
-"Selection \"{0}\" is used by relation \"{1}\" with role {2}.\n"
-"Delete from relation?"
-msgstr ""
-"الخيار \"{0}\" مستعمل من العلاقة \"{1}\" في الدور {2}.\n"
-"محو من العلاقة ؟"
-
-#: ../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 "حرك"
-
-#: ../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 "التعاقب"
-
-#: ../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 "ملف إعدادات غير صحيح التكوين في الأسطر {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:324
-#, java-format
-msgid "Cannot open preferences directory: {0}"
-msgstr "غير قادر على فتح دليل التفضيلات: {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 "التفضيلات المخزنة على {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:82
-#, java-format
-msgid "Could not upload preferences. Reason: {0}"
-msgstr "لم أتمكن من تحميل التفضيلات. السبب هو : {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:93
-msgid "Could not load preferences from server."
-msgstr "لم أتمكن من تحميل التفضيلات من الخادم."
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:34
-msgid "different"
-msgstr "مختلف"
-
-#: ../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 "خطأ : {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
-#, java-format
-msgid "Warning: {0}"
-msgstr "تحذير: {0}"
-
-#: ../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"
@@ -2347,5 +2584,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:122
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "railway"
 msgstr "خط سكة حديد"
@@ -2371,4 +2608,62 @@
 msgstr[5] "{0} عقد"
 
+#: ../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."
@@ -2516,5 +2811,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 "الخلفية"
@@ -2587,8 +2882,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
@@ -2600,7 +2895,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
@@ -2701,10 +2996,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 "إسم المستخدم"
 
 #: ../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 "كلمة‌المرور"
@@ -2798,22 +3093,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:146
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148
 msgid "File"
 msgstr "الملفّ"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150
 msgid "View"
 msgstr "العرض"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:149
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151
 msgid "Tools"
 msgstr "العدة"
 
-#: ../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 "التعيينات المسبقة"
 
-#: ../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
@@ -2826,21 +3121,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 "أعرض الأسلاك"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:218
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221
 msgid "Toggle Wireframe view"
 msgstr "أقلب عرض الأسلاك"
 
-#: ../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 "سمعيّ"
@@ -2912,6 +3207,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 "الطبقة ليست في اللائحة."
@@ -2921,9 +3216,9 @@
 msgstr "جاري الإتصال بلخادم أو.أس.أم ..."
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:104
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:105
 msgid "Error while parsing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:107
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:108
 msgid "File not found"
 msgstr "لم يُعثر على الملف"
@@ -2995,5 +3290,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 "الأعضاء"
@@ -3189,5 +3484,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
@@ -3269,5 +3564,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 ""
@@ -3306,5 +3601,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 ""
 
@@ -3358,5 +3653,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 "الدّور"
@@ -3460,5 +3755,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
@@ -3767,5 +4062,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 "العلاقات"
@@ -3874,66 +4169,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 "الأساسي"
 
-#: ../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 "المشغول من"
 
-#: ../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 ""
 
-#: ../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 "حرّك الأعضاء المختارة حالياً إلى الأعلى"
 
-#: ../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 "أضف الإختيار"
 
-#: ../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 "أضف كلّ الأغراض المختارة حالياً كأعضاء"
 
-#: ../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 "أزل المختارة"
 
-#: ../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 "إنزع كلّ الأغراض المختارة حالياً من العلاقة"
 
-#: ../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 "حرّك الأعضاء المختارة حالياً إلى الأسفل"
 
-#: ../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 "أزل العضو في سطر الجدول الحالي من هذه العلاقة"
 
-#: ../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 "نزّل الأعضاء"
 
-#: ../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 "نزّل كلّ من العقد و الطرقات الغير مكتملة في العلاقة"
@@ -3978,5 +4273,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
@@ -3997,9 +4292,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
@@ -4021,31 +4316,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 "الأعضاء: {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 "محرّر العلاقات: {0}"
 
-#: ../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 "حصل تعارض حين الإستيراد."
 
-#: ../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 "خطأ عند التحليل النحوي لردّ المخدم."
 
-#: ../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 "غير قادر على الإتصال بلمخدم."
+
+#: ../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
@@ -4109,17 +4407,17 @@
 msgstr "مصادر المعطيات و نوعيتها"
 
-#: ../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 "نزّل كطبقة جديدة"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:174
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:173
 msgid "Download Area"
 msgstr "نزّل المساحة"
 
-#: ../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 "المساحة المطلوبة ضخمة جداً، إحتمال أن ترفض من قبل الخادم"
 
-#: ../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 "هذه المساحة ممكن تنزيلها، القياس مقبول من الخادم"
@@ -4147,5 +4445,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 "الأماكن"
@@ -4192,21 +4490,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 "النوع"
@@ -4246,14 +4544,4 @@
 msgid "Tile Numbers"
 msgstr "أرقام البلاطة"
-
-#: ../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 "يمكنك إستعمال الفأرة أو المفاتيح Ctrl+سهم كي تكبر/تصغر أو للإزاحة"
-
-#. 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 "الخريطة"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:98
@@ -4336,5 +4624,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)"
@@ -4450,14 +4738,14 @@
 msgstr "ملفات صوتيت (*.wav)"
 
-#: ../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 "العلامات الصوتية من {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244
 msgid "Import images"
 msgstr "إستورد صور"
 
-#: ../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, "
@@ -4466,5 +4754,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, "
@@ -4473,5 +4761,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"
@@ -4480,28 +4768,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 "الإسم: {0}"
 
-#: ../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 "الوصف: {0}"
 
-#: ../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 ""
 
-#: ../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 ""
@@ -4512,11 +4800,11 @@
 "مضرة.<br>أنظر هنا إذا أردت تحميل بعض الأثرات:"
 
-#: ../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
@@ -4526,29 +4814,29 @@
 msgstr "محوّل من: {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 "{0} أمتار"
 
-#: ../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 "{0} كلم²"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:822
 #, java-format
 msgid ""
@@ -4557,9 +4845,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 "
@@ -4567,5 +4855,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 "
@@ -4573,33 +4861,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 "{0} يتألف من:"
 
-#: ../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} ممحي.)"
 
-#: ../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"
@@ -4607,21 +4904,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"
@@ -4779,5 +5076,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
@@ -4786,5 +5083,5 @@
 msgstr ""
 
-#: ../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
@@ -4792,5 +5089,5 @@
 msgstr "القيمة الجديدة لِــ {0}"
 
-#: ../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
@@ -4800,5 +5097,5 @@
 msgstr ""
 
-#: ../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 "أدخل زوج جديد مفتاح/قيمة"
@@ -5675,106 +5972,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 "الإسم"
@@ -6240,6 +6537,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:36
-msgid "Login name (email) to the OSM account."
-msgstr "إسم الدخول (البريد الإلكتروني) للحساب أو.أس.أم."
+msgid "Login name (e-mail) to the OSM account."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
@@ -6253,6 +6550,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
-msgid "OSM username (email)"
-msgstr "الإسم لدى أو.أس.أم (البريد الإلكتروني)"
+msgid "OSM username (e-mail)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
@@ -6263,5 +6560,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 ""
@@ -6559,6 +6856,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 "جاري الإتصال بلخادم أو.أس.أم"
@@ -6569,7 +6867,7 @@
 msgstr "جاري تحميل النقاط {0} إلى {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 "جاري تنزيل معطيات أو.أس.أم"
@@ -6634,15 +6932,14 @@
 msgstr "فشل إستيراد NMEA !"
 
-#: ../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 ""
@@ -6651,31 +6948,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 ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:351
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298
 msgid "Closing changeset..."
 msgstr ""
 
-#: ../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 "اعداد..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:381
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:326
 msgid "Uploading..."
 msgstr "جاري الإرسال..."
@@ -6690,25 +6993,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 "الإسم أو كلمة المرور خطأ"
 
-#: ../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 "تحذير: يتم نقل كلمة المرور بدون تعتيم"
 
-#: ../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 "إحفظ المستخدم و كلمة المرور (غير معتمة)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:89
 msgid "Enter Password"
 msgstr "أدخل كلمة المرور"
 
-#: ../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..."
@@ -6719,4 +7022,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."
@@ -6809,24 +7155,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 "جاري الإتصال بلخادم"
 
-#: ../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 "إستحالة الإتصال بلخادم أو.أس.أم. الرجاء فحص إتصالات الإنترنت."
 
-#: ../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 "ردّ الخادم بخطأ داخلي. حاول مرة ثانية بمنطقة أصغر أو إنتظر بعض الوقت."
-
-#: ../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 ""
 
@@ -6842,5 +7196,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 ""
@@ -7012,9 +7366,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:127
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
 msgid "Download missing plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:128
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:119
 #, java-format
 msgid ""
@@ -7024,6 +7378,6 @@
 msgstr ""
 
+#: ../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
@@ -7046,35 +7400,35 @@
 msgstr "مجهول"
 
-#: ../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}: الإصدار {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 ""
 
-#: ../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 "يتم ذلك بعد الإنتهاء من التسجيل"
 
-#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:329
+#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:340
 msgid "Error playing sound"
 msgstr "خطأ تشغيل صوت"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
 msgid "Do nothing"
 msgstr "لا تفعل أي شيء"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
 msgid "Report Bug"
 msgstr "بلّغ عن علّة"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:52
 msgid ""
 "An unexpected exception occurred.\n"
@@ -7084,18 +7438,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55
 msgid "Unexpected Exception"
 msgstr "الشذوذ غيرال متوقع"
 
-#: ../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 "الرجاء التبليغ بواسطة بطاقة عند {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 "دلّ على الخطوات اللتي أوصلتك إلى هذا الخطأ ( بطريقة مفصلة)"
 
-#: ../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 "
@@ -7103,9 +7457,9 @@
 msgstr ""
 
-#: ../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 "تأكد  من ضمّ المعلومات التالية:"
 
-#: ../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 ""
@@ -7186,5 +7540,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 ""
@@ -7551,5 +7905,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 ""
@@ -7583,5 +7937,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"
@@ -7604,5 +7957,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
@@ -7693,6 +8046,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/"
@@ -7768,6 +8121,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
@@ -7775,11 +8128,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 ""
@@ -7796,13 +8149,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 ""
@@ -7823,5 +8176,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 ""
 
@@ -7914,5 +8267,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
@@ -7920,59 +8273,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 ""
@@ -7981,14 +8303,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 ""
@@ -8083,11 +8405,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 ""
@@ -8097,5 +8419,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 ""
@@ -8382,4 +8704,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 ""
 
@@ -8691,42 +9017,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 ""
@@ -8783,5 +9109,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 ""
 
@@ -8857,5 +9183,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 "
@@ -8863,9 +9189,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 ""
@@ -9292,5 +9618,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 "إسم الشارع"
@@ -9380,5 +9706,5 @@
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:195
-msgid "No intersections found. Nothing was changed."
+msgid "No intersection found. Nothing was changed."
 msgstr ""
 
@@ -10241,19 +10567,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 ""
@@ -10312,5 +10637,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113
 #, java-format
 msgid ""
@@ -10352,4 +10677,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 ""
 
@@ -10441,4 +10791,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 ""
@@ -10453,5 +10808,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 ""
 
@@ -10735,5 +11090,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 ""
@@ -11235,5 +11590,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 ""
@@ -11702,7 +12057,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 "النوع"
@@ -12318,10 +12673,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 "شركة الإدارة"
@@ -12533,7 +12888,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 "إرتفاع"
@@ -13465,5 +13820,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 "رسم دخول/إجرة"
@@ -13599,5 +13954,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 ""
@@ -13605,5 +13960,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 "مساحة"
@@ -13655,11 +14010,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 ""
@@ -13667,5 +14032,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1512
+#: build/trans_presets.java:1513
 msgid "Taxi"
 msgstr "تاكسي"
@@ -13673,5 +14038,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 "حرّر موقف تاكسي"
@@ -13679,5 +14044,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1519
+#: build/trans_presets.java:1520
 msgid "Airport"
 msgstr "مطار"
@@ -13685,15 +14050,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 ""
@@ -13702,5 +14067,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1532
+#: build/trans_presets.java:1533
 msgid "Accomodation"
 msgstr "مكان المبيت"
@@ -13712,5 +14077,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 "فندق"
@@ -13719,15 +14084,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 "فندق (رخيص)"
@@ -13735,20 +14100,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 "كوخ"
@@ -13756,10 +14121,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 "نزل"
@@ -13767,30 +14132,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 "موقع تخييم"
@@ -13798,10 +14163,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 "طعام و شراب"
@@ -13812,5 +14177,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 "مطعم"
@@ -13818,5 +14183,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 "حرّر مطعم"
@@ -13824,5 +14189,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 "الطبخ"
@@ -13830,61 +14195,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 "وجبات سريعة"
@@ -13892,9 +14257,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 "مقهى إستراحة"
@@ -13902,10 +14267,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 "حانة"
@@ -13913,20 +14278,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 "حانة"
@@ -13934,10 +14299,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 "نادي سهر / نادي ليلي"
@@ -13945,20 +14310,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 ""
@@ -13967,11 +14332,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 "متحف"
@@ -13979,10 +14344,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 "حديقة حيوانات"
@@ -13991,10 +14356,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 "موقع كاشف"
@@ -14002,25 +14367,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 "أعمال فنية"
@@ -14028,5 +14393,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 "حرّر أعمال فنية"
@@ -14034,5 +14399,5 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1667
 msgid "Information Office"
 msgstr "مكتب إستعلامات"
@@ -14040,83 +14405,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 "الخريطة"
+
 #. 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 "حرّر ملجأ"
@@ -14124,25 +14486,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 "قلعة"
@@ -14151,20 +14513,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 "موقع أثري"
@@ -14173,10 +14535,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 "ساحة معركة"
@@ -14184,5 +14546,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 "حرّر ساحة معركة"
@@ -14190,15 +14552,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 "نصب تذكاري"
@@ -14206,45 +14568,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 "ملعب"
@@ -14252,15 +14614,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 "حرّر صيد السمك"
@@ -14268,15 +14630,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 "حرّر مدرج ألعاب رياضية"
@@ -14290,6 +14652,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 "إختر الرياضة :"
@@ -14665,6 +15027,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
@@ -14697,227 +15059,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 ""
@@ -14956,191 +15318,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 "تزلّج"
@@ -15148,56 +15510,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 "الصعوبة"
 
 #. 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 "سهل"
 
-#: 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 "خبير"
 
-#: 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 "رماية"
@@ -15205,178 +15567,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 ""
 
 #. item
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:1960
 msgid "Edit Baseball"
 msgstr ""
 
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:1965
 msgid "Basketball"
 msgstr "كرة السلّة"
 
 #. item
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:1966
 msgid "Edit Basketball"
 msgstr "حرّر كرة السلّة"
 
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:1971
 msgid "Golf"
 msgstr ""
 
 #. 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 ""
 
 #. item
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:1990
 msgid "Edit Cricket"
 msgstr ""
 
-#: 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 ""
 
 #. item
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2026
 msgid "Edit Rugby"
 msgstr ""
 
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:2031
 msgid "Table Tennis"
 msgstr "تنس الطاولة"
 
 #. item
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2032
 msgid "Edit Table Tennis"
 msgstr "حرّر تنس الطاولة"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2037
 msgid "Tennis"
 msgstr "تنس"
 
 #. item
-#: build/trans_presets.java:2037
+#: build/trans_presets.java:2038
 msgid "Edit Tennis"
 msgstr "حرّر تنس"
 
 #. <separator/>
-#: build/trans_presets.java:2044
+#: build/trans_presets.java:2045
 msgid "Buildings"
 msgstr "مباني"
 
 #. group "Buildings"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2046
 msgid "Building"
 msgstr "مبنى"
@@ -15384,5 +15746,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2049
 msgid "Public Building"
 msgstr "مبنى عام"
@@ -15390,10 +15752,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 "مبنى البلدية"
@@ -15401,10 +15763,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 "حرّر مبنى البلدية"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2061
 msgid "Embassy"
 msgstr "سفارة"
@@ -15412,10 +15774,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 "حرّر سفارة"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2066
+#: build/trans_presets.java:2067
 msgid "Courthouse"
 msgstr "محكمة"
@@ -15424,10 +15786,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 "حرّر محكمة"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2074
 msgid "Prison"
 msgstr "سجن"
@@ -15436,10 +15798,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 "حرّر سجن"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2080
+#: build/trans_presets.java:2081
 msgid "Police"
 msgstr "شرطة"
@@ -15449,10 +15811,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 "حرّر شرطة"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2089
 msgid "Fire Station"
 msgstr "فوج إطفاء"
@@ -15461,10 +15823,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 "حرّر فوج إطفاء"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2096
 msgid "Post Office"
 msgstr "مكتب البريد"
@@ -15472,5 +15834,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 "حرّر مكتب البريد"
@@ -15478,15 +15840,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2103
 msgid "Kindergarten"
 msgstr "حضانة أطفال"
 
 #. item
-#: build/trans_presets.java:2103
+#: build/trans_presets.java:2104
 msgid "Edit Kindergarten"
 msgstr "حرّر حضانة أطفال"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2108
 msgid "School"
 msgstr "مدرسة"
@@ -15494,10 +15856,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 "حرّر مدرسة"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2114
 msgid "University"
 msgstr "جامعة"
@@ -15505,10 +15867,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 "حرّر جامعة"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2120
 msgid "College"
 msgstr "كلّية"
@@ -15516,5 +15878,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 "حرّر كلّية"
@@ -15522,5 +15884,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2126
+#: build/trans_presets.java:2127
 msgid "Cinema"
 msgstr "سينما"
@@ -15529,10 +15891,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 "حرّر سينما"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2133
+#: build/trans_presets.java:2134
 msgid "Library"
 msgstr "مكتبة"
@@ -15541,10 +15903,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 "حرّر مكتبة"
 
 #. item "Buildings/Library" text "Name"
-#: build/trans_presets.java:2140
+#: build/trans_presets.java:2141
 msgid "Arts Centre"
 msgstr "مركز ثقافي"
@@ -15552,10 +15914,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 "مسرح"
@@ -15564,10 +15926,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 "حرّر مسرح"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2154
 msgid "Place of Worship"
 msgstr "معبد"
@@ -15577,5 +15939,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 "حرّر معبد"
@@ -15584,6 +15946,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 "الديانة"
@@ -15592,66 +15954,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 "بوذي"
 
-#: 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 "نصراني"
 
-#: 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 "هندوس"
 
-#: 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 "يهودي"
 
-#: 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 "مسلم"
 
-#: 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 "سيخ"
 
-#: 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 "روحاني"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2881
-#: build/trans_presets.java:2890
-msgid "taoist"
-msgstr ""
-
-#: build/trans_presets.java:2160 build/trans_presets.java:2881
-#: build/trans_presets.java:2890
-msgid "unitarian"
-msgstr ""
-
-#: build/trans_presets.java:2160 build/trans_presets.java:2881
-#: build/trans_presets.java:2890
-msgid "zoroastrian"
-msgstr ""
-
 #: build/trans_presets.java:2161 build/trans_presets.java:2882
 #: build/trans_presets.java:2891
+msgid "taoist"
+msgstr ""
+
+#: build/trans_presets.java:2161 build/trans_presets.java:2882
+#: build/trans_presets.java:2891
+msgid "unitarian"
+msgstr ""
+
+#: build/trans_presets.java:2161 build/trans_presets.java:2882
+#: build/trans_presets.java:2891
+msgid "zoroastrian"
+msgstr ""
+
+#: build/trans_presets.java:2162 build/trans_presets.java:2883
+#: build/trans_presets.java:2892
 msgid "Denomination"
 msgstr "الطقوس الدينية"
@@ -15660,81 +16022,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 ""
 
-#: 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 "معمداني"
 
-#: 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 "كثليك"
 
-#: 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 "إنجيلي"
 
-#: 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 "شهود يهوه"
 
-#: 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 "لوثري"
 
-#: 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 "منهجي"
 
-#: 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 ""
 
-#: 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 "أرثدكس"
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 "بروتستاني"
 
-#: 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 ""
 
-#: 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 "عناوين"
@@ -15743,5 +16105,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 "حرّر معلومات عنوان"
@@ -15749,5 +16111,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2169
+#: build/trans_presets.java:2170
 msgid "House number"
 msgstr "رقم المنزل"
@@ -15755,20 +16117,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2172
 msgid "House name"
 msgstr "تسمية المنزل"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2174
 msgid "City name"
 msgstr "إسم المدينة"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2174
+#: build/trans_presets.java:2175
 msgid "Post code"
 msgstr "الرمز البريدي"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2176
 msgid "Country code"
 msgstr "رمز البلد"
@@ -15776,5 +16138,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2179
 msgid "Address Interpolation"
 msgstr "إستيفاء العنوان"
@@ -15783,5 +16145,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 "حرّر إستيفاء العنوان"
@@ -15789,71 +16151,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 "مفرد"
 
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2184
 msgid "even"
 msgstr "مثنى"
 
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2184
 msgid "all"
 msgstr "الكلّ"
 
-#: 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 "من صنع الإنسان"
 
 #. group "Man Made"
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2188
 msgid "Works"
 msgstr "المصانع"
 
 #. item
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2189
 msgid "Edit Works"
 msgstr "حرّر المصانع"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2193
 msgid "Tower"
 msgstr "برج"
 
 #. item
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2194
 msgid "Edit Tower"
 msgstr "حرّر برج"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2198
 msgid "Water Tower"
 msgstr "خزان / برج مياه"
 
 #. item
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2199
 msgid "Edit Water Tower"
 msgstr "حرّر خزان/برج مياه"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2203
 msgid "Gasometer"
 msgstr "خزان محروقات"
 
 #. item
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2204
 msgid "Edit Gasometer"
 msgstr "حرّر خزان المحروقات"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2207
+#: build/trans_presets.java:2208
 msgid "Lighthouse"
 msgstr "منارة"
@@ -15861,10 +16223,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 "حرّر منارة"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2214
 msgid "Windmill"
 msgstr "طاحونة هوائية"
@@ -15872,10 +16234,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 "حرّر طاحونة هوائية"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2220
 msgid "Pipeline"
 msgstr "خط أنابيب"
@@ -15883,10 +16245,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 "حرّر خط أنابيب"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2225
+#: build/trans_presets.java:2226
 msgid "Wastewater Plant"
 msgstr "محطّة تكرير مياه"
@@ -15896,10 +16258,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 "ونش"
@@ -15907,10 +16269,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 "حرّر ونش"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2239
+#: build/trans_presets.java:2240
 msgid "Beacon"
 msgstr "عمود إضائة"
@@ -15918,10 +16280,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 "حرّر عمود إضاءة"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2245
+#: build/trans_presets.java:2246
 msgid "Survey Point"
 msgstr "نقطة رؤية"
@@ -15929,10 +16291,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 "حرّر نقطة رؤية"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2252
 msgid "Surveillance"
 msgstr "مراقبة"
@@ -15940,5 +16302,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 "حرّر كامرة مراقبة"
@@ -15946,5 +16308,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2258
+#: build/trans_presets.java:2259
 msgid "Power Generator"
 msgstr "مولد طاقة"
@@ -15954,39 +16316,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 "حرّر مولد طاقة"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "wind"
 msgstr "أرياح"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "hydro"
 msgstr "مائية"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "fossil"
 msgstr "طاقة أحفورية"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "nuclear"
 msgstr "نووية"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "coal"
 msgstr "فحم"
 
-#: 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 "غاز"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2268
 msgid "Power Station"
 msgstr "محطة توليد طاقة"
@@ -15995,10 +16357,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 "حرّر محطة توليد طاقة"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2274
+#: build/trans_presets.java:2275
 msgid "Power Sub Station"
 msgstr "محطة طاقة فرعية"
@@ -16007,5 +16369,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 "حرّر محطة طاقة فرعية"
@@ -16013,10 +16375,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 "عمود كهربائي"
@@ -16027,5 +16389,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 "حرّر عمود كهربائي"
@@ -16033,5 +16395,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 "سلك/خط كهربائي"
@@ -16040,25 +16402,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 "التوتر"
 
 #. 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 "مراحيض"
@@ -16066,20 +16428,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 "الملاحظة"
 
 #. 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 "هاتف"
@@ -16088,5 +16450,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 "حرّر هاتف"
@@ -16094,5 +16456,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 "عملات معدنية"
@@ -16100,5 +16462,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 "الملاحظات"
@@ -16106,5 +16468,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 ""
@@ -16112,5 +16474,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 ""
@@ -16118,15 +16480,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 "بطاقات إعتماد"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2328
 msgid "Telephone cards"
 msgstr "بطاقات هاتفية"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2330
 msgid "Recycling"
 msgstr "إعادة تصنيع الأشياء"
@@ -16135,5 +16497,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 "حرّر إعادة تصنيع الأشياء"
@@ -16141,35 +16503,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 "بطاريات"
 
 #. 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 "ملابس"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2338
 msgid "Glass"
 msgstr "زجاج"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2339
 msgid "Paper"
 msgstr "ورق"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2340
 msgid "Scrap Metal"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2342
 msgid "Bench"
 msgstr ""
@@ -16178,20 +16540,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 ""
 
 #. item
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2347
 msgid "Edit Hunting Stand"
 msgstr ""
 
 #. item "Amenities/Hunting Stand" check "Shelter"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2350
 msgid "Hide"
 msgstr "مخبئ"
 
 #. item "Amenities/Hunting Stand" check "Hide"
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2351
 msgid "Lock"
 msgstr ""
@@ -16199,22 +16561,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 "الإرتفاع"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2351
+#: build/trans_presets.java:2352
 msgid "low"
 msgstr "منخفض"
 
-#: build/trans_presets.java:2351
+#: build/trans_presets.java:2352
 msgid "half"
 msgstr "نصف"
 
-#: build/trans_presets.java:2351
+#: build/trans_presets.java:2352
 msgid "full"
 msgstr "ملء"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2354
 msgid "Fountain"
 msgstr "نافورة"
@@ -16223,10 +16585,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 "حرّر نافورة"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2361
 msgid "Drinking Water"
 msgstr "ماء شفة"
@@ -16235,10 +16597,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 "حرّر ماء شفة"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2367
+#: build/trans_presets.java:2368
 msgid "Baby Hatch"
 msgstr ""
@@ -16246,25 +16608,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 "مَتاجر/دكاكين"
 
 #. group "Shops"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2377
 msgid "Supermarket"
 msgstr "سوبرماركت"
 
 #. item
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2378
 msgid "Edit Supermarket"
 msgstr "حرّر سوبرماركت"
 
 #. item "Shops/Supermarket" text "Name"
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:2382
 msgid "Convenience Store"
 msgstr ""
@@ -16272,10 +16634,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 "كشك"
@@ -16283,10 +16645,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 "حرّر كشك"
 
 #. item "Shops/Kiosk" text "Name"
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2394
 msgid "Vending machine"
 msgstr "آلة بيع"
@@ -16294,5 +16656,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 ""
@@ -16300,88 +16662,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 "تذاكر_النقل_العام"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "public_transport_plans"
 msgstr "خرائط_النقل_العام"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "parking_tickets"
 msgstr "تذاكر_موقف_سيارات"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "food"
 msgstr "مأكولات"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "drinks"
 msgstr "مشروبات"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "sweets"
 msgstr "حلويات"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "cigarettes"
 msgstr "سجائر"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "photos"
 msgstr "صور"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "animal_food"
 msgstr "مأكولات للحيوانات"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "news_papers"
 msgstr "جرائد"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "toys"
 msgstr "ألعاب"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "stamps"
 msgstr "طوابع"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "SIM-cards"
 msgstr "رقائق SIM"
 
-#: 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 "مانع الحمل"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "tampons"
 msgstr "سدادات قطنية"
 
-#: 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 "جزار"
@@ -16389,10 +16751,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 "حرّر جزار"
 
 #. item "Shops/Butcher" text "Name"
-#: build/trans_presets.java:2414
+#: build/trans_presets.java:2415
 msgid "Baker"
 msgstr "خباز"
@@ -16400,10 +16762,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 "حرّر خباز"
 
 #. item "Shops/Baker" text "Name"
-#: build/trans_presets.java:2420
+#: build/trans_presets.java:2421
 msgid "Florist"
 msgstr "بائع الزهور"
@@ -16411,20 +16773,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 "حرّر بائع الزهور"
 
 #. 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 ""
@@ -16432,60 +16794,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 "مشروبات"
 
 #. 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 "حاسوب"
 
 #. item
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2444
 msgid "Edit Computer Shop"
 msgstr "حرّر مبيع قطع حاسوب"
 
 #. item "Shops/Computer" text "Name"
-#: build/trans_presets.java:2447
+#: build/trans_presets.java:2448
 msgid "Electronics"
 msgstr "إلكترونيات"
 
 #. item
-#: build/trans_presets.java:2448
+#: build/trans_presets.java:2449
 msgid "Edit Electronics Shop"
 msgstr "حرّر إلكترونيات"
 
 #. item "Shops/Electronics" text "Name"
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2453
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2454
 msgid "Edit Hifi Shop"
 msgstr "حرّر مبيع Hifi"
 
 #. item "Shops/Hifi" text "Name"
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2458
 msgid "Furniture"
 msgstr "أثاث/فرش"
 
 #. item
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2459
 msgid "Edit Furniture Shop"
 msgstr "حرّر مبيع فرش/أثاث"
 
 #. item "Shops/Furniture" text "Name"
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2463
 msgid "Garden Centre"
 msgstr ""
@@ -16493,10 +16855,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 ""
 
 #. item "Shops/Garden Centre" text "Name"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2469
 msgid "Hardware"
 msgstr "خردوات/أدوات منزلية"
@@ -16504,10 +16866,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 "حرّر مخزن خردوات/أدوات منزلية"
 
 #. item "Shops/Hardware" text "Name"
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2475
 msgid "Do-it-yourself-store"
 msgstr ""
@@ -16515,60 +16877,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 "قرطاسية"
 
 #. item
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2482
 msgid "Edit Stationery Shop"
 msgstr "حرّر مبيع قرطاسية"
 
 #. item "Shops/Stationery" text "Name"
-#: build/trans_presets.java:2485
+#: build/trans_presets.java:2486
 msgid "Hairdresser"
 msgstr "حلاق"
 
 #. item
-#: build/trans_presets.java:2486
+#: build/trans_presets.java:2487
 msgid "Edit Hairdresser"
 msgstr "حرّر حلاق"
 
 #. item "Shops/Hairdresser" text "Name"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2491
 msgid "Shoes"
 msgstr "أحذية"
 
 #. item
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2492
 msgid "Edit Shoe Shop"
 msgstr "حرّر أحذية"
 
 #. item "Shops/Shoes" text "Name"
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2496
 msgid "Toys"
 msgstr "ألعاب"
 
 #. item
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2497
 msgid "Edit Toy Shop"
 msgstr "حرّر مبيع ألعاب"
 
 #. item "Shops/Toys" text "Name"
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2501
 msgid "Video"
 msgstr "مرئيّات"
 
 #. item
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2502
 msgid "Edit Video Shop"
 msgstr "حرّر مبيع مرئيّات"
 
 #. item "Shops/Video" text "Name"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2506
 msgid "Dry Cleaning"
 msgstr "تنظيف جاف"
@@ -16576,10 +16938,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 "حرّر تنظيف جاف"
 
 #. item "Shops/Dry Cleaning" text "Name"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2512
 msgid "Laundry"
 msgstr "مصبغة/غسيل"
@@ -16587,10 +16949,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 "حرّر مصبغة/غسيل"
 
 #. item "Shops/Laundry" text "Name"
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2518
 msgid "Outdoor"
 msgstr "نشاطات في الخلاء"
@@ -16598,35 +16960,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 "حرّر متجر نشاطات في الخلاء"
 
 #. item "Shops/Outdoor" text "Name"
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2524
 msgid "Sports"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2525
 msgid "Edit Sports Shop"
 msgstr "حرّرمبيع  لوازم للأنشطة رياضية"
 
 #. item "Shops/Sports" text "Name"
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2529
 msgid "Optician"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2530
 msgid "Edit Optician"
 msgstr "حرّر نظاراتي"
 
 #. item "Shops/Optician" text "Name"
-#: build/trans_presets.java:2535
+#: build/trans_presets.java:2536
 msgid "Cash"
 msgstr "نقود/أموال"
 
 #. group "Cash"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2537
 msgid "Bank"
 msgstr "مصرف"
@@ -16634,5 +16996,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 "حرّر مصرف"
@@ -16640,10 +17002,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 "صرّاف آلي"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2544
 msgid "Money Exchange"
 msgstr "صرّاف"
@@ -16651,5 +17013,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 "حرّر صرّاف"
@@ -16657,15 +17019,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 "حرّر صراف آلي"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2557
 msgid "Health"
 msgstr "صحة"
 
 #. group "Health"
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2558
 msgid "Doctors"
 msgstr "أطباء"
@@ -16673,20 +17035,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 "حرّر أطباء"
 
 #. item "Health/Doctors" text "Name"
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2564
 msgid "Dentist"
 msgstr "طبيب أسنان"
 
 #. item
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2565
 msgid "Edit Dentist"
 msgstr "حرّر طبيب أسنان"
 
 #. item "Health/Dentist" text "Name"
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2569
 msgid "Pharmacy"
 msgstr "صيدلية"
@@ -16694,5 +17056,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 "حرّر صيدلية"
@@ -16700,10 +17062,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 ""
 
 #. item "Health/Pharmacy" text "Name"
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2576
 msgid "Hospital"
 msgstr "مستشفى"
@@ -16711,10 +17073,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 "حرّر مستشفى"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2582
 msgid "Emergency Access Point"
 msgstr "نقطة دخول طوارئ"
@@ -16723,5 +17085,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 "حرّر نقطة دخول طوارئ"
@@ -16730,20 +17092,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2588
 msgid "Point Number"
 msgstr "رقم النقطة"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2589
 msgid "Point Name"
 msgstr "إسم النقطة"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2591
 msgid "Phone Number"
 msgstr "رقم الهاتف"
 
 #. 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 "إستعمل رمز دولي مثل 12-345-67890"
@@ -16751,5 +17113,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 "بيطري"
@@ -16758,25 +17120,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 "حرّر بيطري"
 
 #. group "Places"
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2605
 msgid "Continent"
 msgstr "قارة"
 
 #. item
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2606
 msgid "Edit Continent"
 msgstr "حرّر قارة"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2611
 msgid "Country"
 msgstr "وطن"
 
 #. item
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2612
 msgid "Edit Country"
 msgstr "حرّر وطن"
@@ -16784,30 +17146,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 "دولة/ولاية"
 
 #. item
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2618
 msgid "Edit State"
 msgstr "حرّر دولة/ولاية"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2622
+#: build/trans_presets.java:2623
 msgid "Region"
 msgstr "قطر/منطقة"
 
 #. item
-#: build/trans_presets.java:2623
+#: build/trans_presets.java:2624
 msgid "Edit Region"
 msgstr "حرّر قطر/منطقة"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2628
+#: build/trans_presets.java:2629
 msgid "County"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2629
+#: build/trans_presets.java:2630
 msgid "Edit County"
 msgstr ""
@@ -16815,15 +17177,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2635
+#: build/trans_presets.java:2636
 msgid "City"
 msgstr "مدينة"
 
 #. item
-#: build/trans_presets.java:2636
+#: build/trans_presets.java:2637
 msgid "Edit City"
 msgstr "حرّر مدينة"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2641
+#: build/trans_presets.java:2642
 msgid "Town"
 msgstr "بلدة"
@@ -16831,10 +17193,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 "حرّر بلدة"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2649
 msgid "Suburb"
 msgstr "ضاحية"
@@ -16842,25 +17204,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 "حرّر ضاحية"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2656
 msgid "Village"
 msgstr "قرية"
 
 #. item
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2657
 msgid "Edit Village"
 msgstr "حرّر قرية"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2662
 msgid "Hamlet"
 msgstr "قرية صغيرة"
 
 #. item
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2663
 msgid "Edit Hamlet"
 msgstr "حرّر قرية صغيرة"
@@ -16868,5 +17230,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2669
 msgid "Locality"
 msgstr "محلة"
@@ -16874,10 +17236,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 "حرّر محلة"
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2676
 msgid "Island"
 msgstr "جزيرة"
@@ -16885,5 +17247,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 "حرّر جزيرة"
@@ -16891,5 +17253,5 @@
 #. item "Places/Island" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2683
+#: build/trans_presets.java:2684
 msgid "Cave Entrance"
 msgstr "مدخل كهف"
@@ -16897,10 +17259,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 "حرّر مدخل كهف"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2690
 msgid "Peak"
 msgstr "قمّة"
@@ -16908,10 +17270,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 "حرّر قمّة"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2697
 msgid "Glacier"
 msgstr "جليد"
@@ -16919,10 +17281,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 "حرّر جليد"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2703
+#: build/trans_presets.java:2704
 msgid "Volcano"
 msgstr "بركان"
@@ -16930,70 +17292,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 "حرّر بركان"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2711
+#: build/trans_presets.java:2712
 msgid "Boundaries"
 msgstr "الحدود"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2713
 msgid "National"
 msgstr "دولية"
 
 #. item
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2714
 msgid "Edit National Boundary"
 msgstr "حرّر حدود دولية"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2718
+#: build/trans_presets.java:2719
 msgid "Administrative"
 msgstr "إدارية"
 
 #. item
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2720
 msgid "Edit Administrative Boundary"
 msgstr "حرّر حدود إدارية"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2724
+#: build/trans_presets.java:2725
 msgid "Civil"
 msgstr "مدنية"
 
 #. item
-#: build/trans_presets.java:2725
+#: build/trans_presets.java:2726
 msgid "Edit Civil Boundary"
 msgstr "حرّر حدود إدارية"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2730
+#: build/trans_presets.java:2731
 msgid "Political"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:2732
 msgid "Edit Political Boundary"
 msgstr "حرّر الحدود السياسية"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2736
+#: build/trans_presets.java:2737
 msgid "National park"
 msgstr "محمية وطنية (بيئية)"
 
 #. item
-#: build/trans_presets.java:2737
+#: build/trans_presets.java:2738
 msgid "Edit National Park Boundary"
 msgstr "حرّر محمية وطنية (التنوع البيئي)"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2744
 msgid "Land use"
 msgstr "إستعمال الأرض"
 
 #. group "Land use"
-#: build/trans_presets.java:2744
+#: build/trans_presets.java:2745
 msgid "Tree"
 msgstr "شجرة"
@@ -17002,15 +17364,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 "حرّر شجرة"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2753
 msgid "Botanical Name"
 msgstr "حرّر اإسم النباتي"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2755
 msgid "Wood"
 msgstr "حرج"
@@ -17019,5 +17381,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 "حرّر حرج"
@@ -17025,17 +17387,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 "صنوبري الثمر"
 
-#: build/trans_presets.java:2760 build/trans_presets.java:2769
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
 msgid "deciduous"
 msgstr ""
 
-#: build/trans_presets.java:2760 build/trans_presets.java:2769
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
 msgid "mixed"
 msgstr "مختلط"
 
-#: build/trans_presets.java:2762
+#: build/trans_presets.java:2763
 msgid "Forest"
 msgstr "غابة"
@@ -17044,14 +17406,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 "حرّر غابة"
 
-#: build/trans_presets.java:2771
+#: build/trans_presets.java:2772
 msgid "Nature Reserve"
 msgstr "محمية طبيعية"
 
 #. item
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2773
 msgid "Edit Nature Reserve"
 msgstr "حرّر محمية طبيعية"
@@ -17059,25 +17421,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2777
+#: build/trans_presets.java:2778
 msgid "Scree"
 msgstr "حصاة"
 
 #. item
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:2779
 msgid "Edit Scree"
 msgstr "حرّر حصاة"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2783
 msgid "Scrub"
 msgstr "أشجار منخفضة"
 
 #. item
-#: build/trans_presets.java:2783
+#: build/trans_presets.java:2784
 msgid "Edit Scrub"
 msgstr "حرّر أشجار منخفضة"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2788
 msgid "Fell"
 msgstr ""
@@ -17085,10 +17447,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 "هوّة"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2794
 msgid "Heath"
 msgstr ""
@@ -17096,5 +17458,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 "حرّر أرض بور"
@@ -17102,5 +17464,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2801
 msgid "Farmyard"
 msgstr "فناء مزرعة"
@@ -17109,45 +17471,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 "حرّر فناء مزرعة"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2808
+#: build/trans_presets.java:2809
 msgid "Farmland"
 msgstr "أرض زراعية"
 
 #. item
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2810
 msgid "Edit Farmland Landuse"
 msgstr "حرّر أرض زراعية"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2814
+#: build/trans_presets.java:2815
 msgid "Meadow"
 msgstr "مرج"
 
 #. item
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2816
 msgid "Edit Meadow Landuse"
 msgstr "حرّر مرج"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2820
+#: build/trans_presets.java:2821
 msgid "Vineyard"
 msgstr "كرم عنب"
 
 #. item
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2822
 msgid "Edit Vineyard Landuse"
 msgstr "حرّر كرم عنب"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2826
+#: build/trans_presets.java:2827
 msgid "Allotments"
 msgstr "حصص سكنية"
 
 #. item
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:2828
 msgid "Edit Allotments Landuse"
 msgstr "حرّر حصص سكنية"
@@ -17155,25 +17517,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2833
+#: build/trans_presets.java:2834
 msgid "Garden"
 msgstr "حديقة"
 
 #. item
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2835
 msgid "Edit Garden"
 msgstr "حرّر حديقة"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2838
+#: build/trans_presets.java:2839
 msgid "Grass"
 msgstr "عشب"
 
 #. item
-#: build/trans_presets.java:2839
+#: build/trans_presets.java:2840
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2845
 msgid "Village Green"
 msgstr ""
@@ -17181,10 +17543,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 ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:2852
 msgid "Common"
 msgstr "شائع"
@@ -17192,20 +17554,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 "حرّر شائع"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2858
 msgid "Park"
 msgstr "متنزه"
 
 #. item
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:2859
 msgid "Edit Park"
 msgstr "حرّر متنزه"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2863
 msgid "Recreation Ground"
 msgstr "ميدان ألعاب"
@@ -17213,5 +17575,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 "حرّر ميدان ألعاب"
@@ -17219,15 +17581,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2871
 msgid "Residential area"
 msgstr "منطقة سكنية"
 
 #. item
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2872
 msgid "Edit Residential Landuse"
 msgstr "حرّر منطقة سكنية"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2877
 msgid "Graveyard"
 msgstr "مقبرة"
@@ -17235,9 +17597,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 "حرّر مقبرة"
 
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:2885
 msgid "Cemetery"
 msgstr "مقبرة"
@@ -17245,39 +17607,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 "حرّر إستعمال الأرض كمقبرة"
 
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2894
 msgid "Retail"
 msgstr "بيع بلمفرق"
 
 #. item
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2895
 msgid "Edit Retail Landuse"
 msgstr "حرّر بيع بلمفرق"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2900
 msgid "Commercial"
 msgstr "تجاري"
 
 #. item
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2901
 msgid "Edit Commercial Landuse"
 msgstr "حرّر إستعمال تجاري للأرض"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2906
 msgid "Industrial"
 msgstr "صناعي"
 
 #. item
-#: build/trans_presets.java:2906
+#: build/trans_presets.java:2907
 msgid "Edit Industrial Landuse"
 msgstr "حرّر الإستعمال الصناعي"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2912
 msgid "Railway land"
 msgstr "أرض سكة حديد"
@@ -17285,15 +17647,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 "حرّر أرض سكة حديد"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:2919
 msgid "Military"
 msgstr "عسكري"
 
 #. item
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2920
 msgid "Edit Military Landuse"
 msgstr "حرّر الإستخدام العسكري للأرض"
@@ -17301,55 +17663,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2925
+#: build/trans_presets.java:2926
 msgid "Construction area"
 msgstr "موقع ورشة إعمار"
 
 #. item
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2927
 msgid "Edit Construction Landuse"
 msgstr "حرّر موقع ورشة إعمار"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2932
 msgid "Brownfield"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:2933
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2937
+#: build/trans_presets.java:2938
 msgid "Greenfield"
 msgstr "حقل أخضر"
 
 #. item
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:2939
 msgid "Edit Greenfield Landuse"
 msgstr "حرّر إستعمال الأرض كحقل أخضر"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:2944
 msgid "Landfill"
 msgstr "مطمر نفايات"
 
 #. item
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:2945
 msgid "Edit Landfill Landuse"
 msgstr "حرّر مطمر نفايات"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2950
 msgid "Quarry"
 msgstr "كسّارة، مقلع حجارة"
 
 #. item
-#: build/trans_presets.java:2950
+#: build/trans_presets.java:2951
 msgid "Edit Quarry Landuse"
 msgstr "حرّر كسّارة / مقلع حجارة"
 
 #. group "Relations"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2960
 msgid "Multipolygon"
 msgstr "متعدد الضلوع"
@@ -17359,5 +17721,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 "حرّر متعدد الضلوع"
@@ -17366,10 +17728,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:2970
 msgid "outer segment"
 msgstr "الفلق الخارجي"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:2970
+#: build/trans_presets.java:2971
 msgid "inner segment"
 msgstr "حرّر الفلق الخارجي"
@@ -17377,5 +17739,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:2974
 msgid "Turn restriction"
 msgstr "حصر الإنعطاف"
@@ -17384,5 +17746,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 "حرّر حصر الإنعطاف"
@@ -17390,34 +17752,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 "حصر"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_left_turn"
 msgstr "إنعطاف_يسار_ممنوع"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_right_turn"
 msgstr "إنعطاف_يمين_ممنوع"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_straight_on"
 msgstr "على_الطول_ممنوع"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_u_turn"
 msgstr "رجوع_ممنوع"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "only_right_turn"
 msgstr "إنعطاف_يميني_فقط"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "only_left_turn"
 msgstr "إنعطاف_يسار_ممنوع"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "only_straight_on"
 msgstr "على_الطول_فقط"
@@ -17426,15 +17788,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2983
+#: build/trans_presets.java:2984
 msgid "from way"
 msgstr "من الطريق"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2985
 msgid "via node or way"
 msgstr "مروراً بلعقدة أو الطريق"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2986
 msgid "to way"
 msgstr "إلى الطريق"
@@ -17442,5 +17804,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:2988
+#: build/trans_presets.java:2989
 msgid "Route"
 msgstr "الطريق"
@@ -17449,5 +17811,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 "حرّر طريق"
@@ -17455,5 +17817,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 "نوع الطريق"
@@ -17525,5 +17887,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
@@ -17532,17 +17894,17 @@
 msgstr ""
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "bus"
 msgstr "حافلة (باص)"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "road"
 msgstr "الطريق"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "ferry"
 msgstr "عبارة بحرية"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "ski"
 msgstr ""
@@ -17595,5 +17957,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
@@ -17602,13 +17964,13 @@
 msgstr ""
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "hiking"
 msgstr ""
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "tram"
 msgstr "ترام"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "detour"
 msgstr ""
@@ -17622,10 +17984,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 ""
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:2997
 msgid "Symbol description"
 msgstr "وصف الرمز"
@@ -17633,26 +17995,26 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:2999
+#: build/trans_presets.java:3000
 msgid "Network"
 msgstr "الشبكة"
 
 #. item "Relations/Route" combo "State"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "proposed"
 msgstr "المقترح"
 
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "alternate"
 msgstr "البديل"
 
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "temporary"
 msgstr "المؤقت"
 
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "connection"
 msgstr "الإتصال"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3003
 msgid "Color (hex)"
 msgstr "اللون (hex)"
@@ -17661,30 +18023,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:3006
 msgid "route segment"
 msgstr "فلق الطريق"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3007
 msgid "forward segment"
 msgstr "الفلق الأمامي"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3008
 msgid "backward segment"
 msgstr "الفلق الخلفي"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3009
 msgid "halt point"
 msgstr "نقطة التوقف"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3010
 msgid "forward halt point"
 msgstr "نقطة التوقف الأمامية"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3011
 msgid "backward halt point"
 msgstr "نقطة التوقف الخلفية"
@@ -21799,10 +22161,28 @@
 msgstr ""
 
+#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
+#~ msgstr "يمكنك إستعمال الفأرة أو المفاتيح Ctrl+سهم كي تكبر/تصغر أو للإزاحة"
+
 #~ msgid "Uploading data"
 #~ msgstr "جاري تحميل التغييرات"
 
+#~ msgid "Email"
+#~ msgstr "البريد الإلكتروني"
+
+#~ msgid "Login name (email) to the OSM account."
+#~ msgstr "إسم الدخول (البريد الإلكتروني) للحساب أو.أس.أم."
+
+#~ msgid "OSM username (email)"
+#~ msgstr "الإسم لدى أو.أس.أم (البريد الإلكتروني)"
+
 #~ msgid "Unknown host"
 #~ msgstr "مضيف غير معروف"
 
+#~ msgid ""
+#~ "Server returned internal error. Try a reduced area or retry after waiting "
+#~ "some time."
+#~ msgstr ""
+#~ "ردّ الخادم بخطأ داخلي. حاول مرة ثانية بمنطقة أصغر أو إنتظر بعض الوقت."
+
 #~ msgid "Commit comment"
 #~ msgstr "أودع الملاحظات"
@@ -21819,2 +22199,15 @@
 #~ msgid "sports"
 #~ msgstr "مبيع لوازم للأنشطة رياضية"
+
+#~ msgid "The following errors occured during mass download:"
+#~ msgstr "حصلت الأخطاء التالية عند التنزيل الضخم:"
+
+#~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">english</A>."
+#~ msgstr "صفحة المساعدة مفقودة. إنشائها بِــ <A HREF=\"{0}\">الإنكليزية</A>."
+
+#~ msgid ""
+#~ "Helppage missing. Create it in <A HREF=\"{0}\">english</A> or <A HREF="
+#~ "\"{1}\">your language</A>."
+#~ msgstr ""
+#~ "صفحة المساعدة مفقودة. إنشائها بِــ <A HREF=\"{0}\"> الإنكليزية</A> أو <A "
+#~ "HREF=\"{1}\">بِلغتك</A>."
Index: applications/editors/josm/i18n/po/bg.po
===================================================================
--- applications/editors/josm/i18n/po/bg.po	(revision 16008)
+++ applications/editors/josm/i18n/po/bg.po	(revision 16009)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-14 16:51+0200\n"
-"PO-Revision-Date: 2009-06-09 19:00+0000\n"
+"POT-Creation-Date: 2009-06-19 21:52+0200\n"
+"PO-Revision-Date: 2009-06-14 17:29+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-06-14 14:47+0000\n"
+"X-Launchpad-Export-Date: 2009-06-19 19:35+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 "Помощ"
 
 #: ../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 ""
 
@@ -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"
@@ -536,5 +538,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}"
@@ -607,6 +609,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:92
-msgid "Email"
-msgstr "Е-поща"
+msgid "E-Mail"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:96
@@ -644,12 +646,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
@@ -676,5 +680,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
@@ -708,15 +712,13 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:207
 #, java-format
-msgid "Helppage missing. Create it in <A HREF=\"{0}\">english</A>."
-msgstr "Липсва страница с помощ. Създайте я на <A HREF=\"{0}\">английски</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 ""
-"Липсва страница с помощ. Създайте я на <A HREF=\"{0}\">английски</A> или <A "
-"HREF=\"{1}\">на вашия език</A>."
 
 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:26
@@ -1151,13 +1153,13 @@
 msgstr "Помощ: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:99
 msgid "Status Report"
 msgstr "Статус Репорт"
 
-#: ../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 "Копиране в буфера за обмен и затварянеч"
 
-#: ../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
@@ -1359,17 +1361,15 @@
 msgstr "Размаркиране всичко (escape)"
 
-#: ../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 "Обновяване на данните"
 
-#: ../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 ""
 "Обновяване на текущия слой с данни от сървъра (презареждане на данните)"
 
-#: ../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?"
@@ -1378,88 +1378,258 @@
 "данни?"
 
-#: ../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 ""
-"Това действие ще изисква {0} индивидуални запитвания за сваляне. Желаете ли "
-"да продължите?"
-
-#: ../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 "Качи на OSM..."
 
-#: ../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 "Качване на всички промени на OSM."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:96
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:94
 msgid "Objects to add:"
 msgstr "Обекти за добавяне:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102
 msgid "Objects to modify:"
 msgstr "Променени обекти:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:110
 msgid "Objects to delete:"
 msgstr "Обекти за изтриване:"
 
-#: ../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 "Опишете измененията на качваните от вас данни:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:126
 msgid "Upload these changes?"
 msgstr "Качване на тези промени?"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:130
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
 msgid "Upload Changes"
 msgstr "Качване на промени"
 
-#: ../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 "Нищо за качване. Първо създайте някакви данни."
 
-#: ../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 "Има неразрешени конфликти. Първо трябва да ги разрешите."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:182
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:180
 msgid "No changes to upload."
 msgstr "Няма промени за качване."
 
-#: ../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 ""
@@ -1564,37 +1734,51 @@
 msgstr "Изходни GPS данни"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:44
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:46
 msgid "Downloading data"
 msgstr "Сваляне на данни"
 
-#: ../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 "Никакви данни не са импортирани"
 
-#: ../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 "Слой Данни {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 "OpenStreetMap данни"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:37
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:45
 msgid "Data Layer"
 msgstr "Слой с данни"
 
-#: ../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 "Сваляне {0} от {1} ({2} остава)"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:88
-msgid "The following errors occured during mass download:"
-msgstr "Следните грешки възникнаха при масово сваляне:"
-
-#: ../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 "Грешки при Сваляне"
+
+#: ../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
@@ -1648,34 +1832,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 "Добавяне на точка"
 
-#: ../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 "Добавяне на точка в път"
 
-#: ../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 "Свързване на съществуващ път към точка"
 
-#: ../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 "Добавяне на нова точка към съществуващ път"
 
-#: ../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 "Добавяне на точка към път и съединяване"
 
-#: ../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 "Създаване нов възел."
 
-#: ../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 "Избиране на точката под курсора."
 
-#: ../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."
@@ -1684,14 +1868,14 @@
 msgstr[1] "Вмъкване на нов възел в {0} пътя."
 
-#: ../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 "Започване на нов път от последния възел."
 
-#: ../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 "Продължаване на път от последния възел."
 
-#: ../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 "Завършване на чертането."
@@ -2019,26 +2203,32 @@
 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 "Зареди избраното"
 
-#: ../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 "Свързване с {0}..."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:45
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:46
 msgid "Downloading..."
 msgstr "Сваляне..."
 
-#: ../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 "Грешка при четене от адрес URL: \"{0}\""
 
-#: ../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 "Грешка на разбор от URL: \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:74
+msgid "Error while communicating with server."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67
@@ -2099,13 +2289,85 @@
 msgstr "Разрешаване {0} конфликти в {1} обекти"
 
-#: ../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 "Изтриване {1} {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97
+#, java-format
+msgid "Delete {0} {1}"
+msgstr "Изтриване {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153
+msgid "Conflicting relation"
+msgstr "Конфликтиращи релации"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147
+#, java-format
+msgid ""
+"Selection \"{0}\" is used by relation \"{1}\" with role {2}.\n"
+"Delete from relation?"
+msgstr ""
+"Селекцията \"{0}\" се използва от релация \"{1}\" в роля {2}.\n"
+"Изтриване от релацията?"
+
+#: ../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 ""
+"Селекцията \"{0}\" се използва от релация \"{1}\".\n"
+"Изтриване от релацията?"
+
+#: ../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 ""
+"Вие се каните да изтриете възли, намиращи се извън зоната, която сте свалили "
+"от сървъра.<br>Това може да предизвика проблеми, защото други обекти (които "
+"не виждате) може да ги използват.<br>Наистина ли искате да ги триете?"
+
+#: ../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 "Преместване"
+
 #: ../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"
@@ -2114,10 +2376,219 @@
 msgstr[1] "възли"
 
-#: ../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 "Последователност"
+
+#: ../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 "Грешка в конфигурационния файл на линии {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:324
+#, java-format
+msgid "Cannot open preferences directory: {0}"
+msgstr "Не може да се отвори директорията с предпочитания: {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 "Файла с предпочитания е повреден. Възстановяване от старо копие в {0}."
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:79
+#, java-format
+msgid "Preferences stored on {0}"
+msgstr "Предпочитанията са записани на {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:82
+#, java-format
+msgid "Could not upload preferences. Reason: {0}"
+msgstr "Невъзможно да се качат предпочитанията. Причина: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:93
+msgid "Could not load preferences from server."
+msgstr "Невъзможно да се заредят предпочитанията от сървъра."
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:34
+msgid "different"
+msgstr "различно"
+
+#: ../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 "Грешка: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
+#, java-format
+msgid "Warning: {0}"
+msgstr "Предупреждение: {0}"
+
+#: ../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"
@@ -2126,8 +2597,10 @@
 msgstr[1] "пътища"
 
-#: ../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
@@ -2138,265 +2611,27 @@
 msgstr[1] "релации"
 
-#: ../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 "Изтриване {1} {0}"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97
-#, java-format
-msgid "Delete {0} {1}"
-msgstr "Изтриване {0} {1}"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153
-msgid "Conflicting relation"
-msgstr "Конфликтиращи релации"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147
-#, java-format
-msgid ""
-"Selection \"{0}\" is used by relation \"{1}\" with role {2}.\n"
-"Delete from relation?"
-msgstr ""
-"Селекцията \"{0}\" се използва от релация \"{1}\" в роля {2}.\n"
-"Изтриване от релацията?"
-
-#: ../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 ""
-"Селекцията \"{0}\" се използва от релация \"{1}\".\n"
-"Изтриване от релацията?"
-
-#: ../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 ""
-"Вие се каните да изтриете възли, намиращи се извън зоната, която сте свалили "
-"от сървъра.<br>Това може да предизвика проблеми, защото други обекти (които "
-"не виждате) може да ги използват.<br>Наистина ли искате да ги триете?"
-
-#: ../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 "Преместване"
-
-#: ../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 "Последователност"
-
-#: ../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 "Грешка в конфигурационния файл на линии {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:324
-#, java-format
-msgid "Cannot open preferences directory: {0}"
-msgstr "Не може да се отвори директорията с предпочитания: {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 "Файла с предпочитания е повреден. Възстановяване от старо копие в {0}."
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:79
-#, java-format
-msgid "Preferences stored on {0}"
-msgstr "Предпочитанията са записани на {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:82
-#, java-format
-msgid "Could not upload preferences. Reason: {0}"
-msgstr "Невъзможно да се качат предпочитанията. Причина: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:93
-msgid "Could not load preferences from server."
-msgstr "Невъзможно да се заредят предпочитанията от сървъра."
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:34
-msgid "different"
-msgstr "различно"
-
-#: ../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 "Грешка: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
-#, java-format
-msgid "Warning: {0}"
-msgstr "Предупреждение: {0}"
-
-#: ../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"
@@ -2410,5 +2645,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:122
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "railway"
 msgstr "железопътна линия"
@@ -2430,4 +2665,62 @@
 msgstr[1] "{0} точки"
 
+#: ../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."
@@ -2575,5 +2868,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 "фон"
@@ -2663,8 +2956,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
@@ -2676,7 +2969,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
@@ -2783,10 +3076,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 "Потребителско име"
 
 #: ../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 "Парола"
@@ -2882,22 +3175,22 @@
 msgstr "Настройката {0} беше премахната тъй като вече не се използва."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:146
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148
 msgid "File"
 msgstr "Файл"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150
 msgid "View"
 msgstr "Преглед"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:149
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151
 msgid "Tools"
 msgstr "Инструменти"
 
-#: ../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 "Шаблони"
 
-#: ../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
@@ -2910,21 +3203,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 "Каркас"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:218
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221
 msgid "Toggle Wireframe view"
 msgstr "Превключване режим каркас"
 
-#: ../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 "Аудио"
@@ -2996,6 +3289,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 "слоя не е в списъка."
@@ -3005,9 +3298,9 @@
 msgstr "Свързване с OSM сървър..."
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:104
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:105
 msgid "Error while parsing"
 msgstr "Грешка при разбор"
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:107
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:108
 msgid "File not found"
 msgstr "Файлът не е намерен"
@@ -3080,5 +3373,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 "Членове"
@@ -3274,5 +3567,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
@@ -3354,5 +3647,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 ""
@@ -3391,5 +3684,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 ""
 
@@ -3443,5 +3736,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 "Роля"
@@ -3545,5 +3838,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
@@ -3854,5 +4147,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 "Релации"
@@ -3959,66 +4252,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 "Основен"
 
-#: ../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 "Обект"
 
-#: ../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 "Маркери (празна стойност изтрива маркера)"
 
-#: ../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 "Преместване на текущо избраните членове нагоре"
 
-#: ../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 "Добавяне на избраните"
 
-#: ../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 "Добавяне на всички текущо обекти като членове"
 
-#: ../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 "Изтриване на избраното"
 
-#: ../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 "Изтриване на всички текущи избрани обекти от релацията"
 
-#: ../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 "Преместване на текущо избраните членове надолу"
 
-#: ../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 "Изтриване на члена от текущия ред на таблицата от тази релация"
 
-#: ../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 "Сваляне членове"
 
-#: ../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 "Сваляне всички непълни пътища и възли от релацията"
@@ -4063,5 +4356,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
@@ -4082,9 +4375,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
@@ -4106,31 +4399,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 "Членове: {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 "Редактор релации: {0}"
 
-#: ../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 "Възникнаха конфликти при импортване."
 
-#: ../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 "Грешка при разбор на отговора на сървъра."
 
-#: ../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 "Невъзможно да се установи връзка със сървъра."
+
+#: ../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
@@ -4196,13 +4492,13 @@
 msgstr "Източници и типове данни"
 
-#: ../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 "Свали като нов слой"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:174
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:173
 msgid "Download Area"
 msgstr "Област за сваляне"
 
-#: ../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 ""
@@ -4210,5 +4506,5 @@
 "на заявката."
 
-#: ../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 "Областта за сваляне е ок, размера е приемлив за сървъра."
@@ -4236,5 +4532,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 "Места"
@@ -4281,21 +4577,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 "тип"
@@ -4335,14 +4631,4 @@
 msgid "Tile Numbers"
 msgstr "Номера квадранти"
-
-#: ../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 "Използвайте мишката или Ctrl+стрелките/./ за мащабиране."
-
-#. 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 "Карта"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:98
@@ -4421,5 +4707,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)"
@@ -4535,14 +4821,14 @@
 msgstr "Wave аудио файлове (*.wav)"
 
-#: ../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 "Аудио маркери от {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244
 msgid "Import images"
 msgstr "Импорт на изображения"
 
-#: ../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, "
@@ -4551,5 +4837,5 @@
 msgstr[1] "{0} следи, "
 
-#: ../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, "
@@ -4558,5 +4844,5 @@
 msgstr[1] "{0} маршрути, "
 
-#: ../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"
@@ -4565,28 +4851,28 @@
 msgstr[1] "{0} точки на интерес"
 
-#: ../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 "Название: {0}"
 
-#: ../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 "Описание: {0}"
 
-#: ../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 "Преобразувай в слой данни"
 
-#: ../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 ""
@@ -4597,11 +4883,11 @@
 "<br>Ако искате да качвате следи, погледнете тук:"
 
-#: ../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
@@ -4611,29 +4897,29 @@
 msgstr "Преобразувано от: {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 "Свали от OSM по дължина на тази следа"
 
-#: ../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 "{0} метри"
 
-#: ../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 "{0} кв. км."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:822
 #, java-format
 msgid ""
@@ -4644,9 +4930,9 @@
 "Продължаване?</html>"
 
-#: ../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 "Няма GPX следа в слоя за да асоциираме звук с нея."
 
-#: ../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 "
@@ -4656,5 +4942,5 @@
 "са пропуснати или преместени в началото."
 
-#: ../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 "
@@ -4664,33 +4950,42 @@
 "смислено да се предположи тяхното време, бяха пропуснати."
 
-#: ../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 "версия {0}"
 
-#: ../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 "{0} се състои от:"
 
-#: ../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} изтрити.)"
 
-#: ../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 "API версия: {0}"
 
-#: ../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"
@@ -4698,21 +4993,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"
@@ -4864,5 +5159,5 @@
 "Стойност по подразбиране неизвестна (настройката все още не е използвана)."
 
-#: ../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
@@ -4871,5 +5166,5 @@
 msgstr "Моля, изберете ред за редактиране"
 
-#: ../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
@@ -4877,5 +5172,5 @@
 msgstr "Нова стойност за {0}"
 
-#: ../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
@@ -4885,5 +5180,5 @@
 msgstr "Моля, изберете ред за изтриване."
 
-#: ../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 "Въведете нова двойка ключ/стойност"
@@ -5776,106 +6071,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 "Име"
@@ -6357,6 +6652,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:36
-msgid "Login name (email) to the OSM account."
-msgstr "Потребителско име (email) за OSM акаунт."
+msgid "Login name (e-mail) to the OSM account."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
@@ -6372,6 +6667,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
-msgid "OSM username (email)"
-msgstr "OSM потребителско име (email)"
+msgid "OSM username (e-mail)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
@@ -6382,10 +6677,7 @@
 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 ""
-"<html>ВНИМАНИЕ: Паролата се съхранява в обиковен текст във файла с "
-"настройките.<br>Паролата се предава като обикновен текст до сървъра, "
-"включена в URL адрес.<br><b>Не използвайте ценна парола.</b></html>"
 
 #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on
@@ -6707,6 +6999,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 "Свързване с OSM Сървър..."
@@ -6717,7 +7010,7 @@
 msgstr "Зареждане точки {0} до {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 "Сваляне данни от OSM..."
@@ -6782,15 +7075,14 @@
 msgstr "Грешка при NMEA импортиране!"
 
-#: ../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 "Тази версия на JOSM е несъвместима с конфигурирания сървър."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:207
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172
 #, java-format
 msgid ""
@@ -6801,31 +7093,37 @@
 "{0} до {1}."
 
-#: ../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 "При комуникация с {0} се свързахме използвайки протокол версия {1}"
 
-#: ../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 "Отваряне на списък промени по версии..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:351
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298
 msgid "Closing changeset..."
 msgstr "Затваряне на списък промени по версии..."
 
-#: ../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 "Подготвяне…"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:381
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:326
 msgid "Uploading..."
 msgstr "Качване..."
@@ -6840,25 +7138,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 "Грешна парола или потребителско име."
 
-#: ../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 "Внимание: Паролата ще бъде предадена нешифрирана."
 
-#: ../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 "Съхрани потребителското име и паролата (нешифрирано)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:89
 msgid "Enter Password"
 msgstr "Въведете парола"
 
-#: ../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..."
@@ -6869,4 +7167,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."
@@ -6959,9 +7300,23 @@
 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 "Свързване със сървъра..."
 
-#: ../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."
@@ -6969,17 +7324,9 @@
 "Неуспешно свързване с OSM сървъра. Моля проверете вашата връзка към интернет."
 
-#: ../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 ""
-"Сървърът върна във вътрешна грешка. Опитайте да намалите областта или "
-"повторете опита си по-късно."
-
-#: ../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 ""
 
@@ -6995,5 +7342,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 "Зареждане на разширенията"
@@ -7185,9 +7532,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 "Сваляне на липсващи разширения"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:128
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:119
 #, java-format
 msgid ""
@@ -7200,6 +7547,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
@@ -7222,35 +7569,35 @@
 msgstr "неизвестно"
 
-#: ../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}: Версия {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 "Разширения доставяни с JOSM"
 
-#: ../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 "Грешка при четене на файла с описанието на разширението: {0}"
 
-#: ../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 "Това е след края на записа"
 
-#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:329
+#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:340
 msgid "Error playing sound"
 msgstr "Грешка при възпроизвеждане на звука"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
 msgid "Do nothing"
 msgstr "Не прави нищо"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
 msgid "Report Bug"
 msgstr "Съобщаване за грешка"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:52
 msgid ""
 "An unexpected exception occurred.\n"
@@ -7264,14 +7611,14 @@
 "на JOSM, бъдете така добри да съобщите за проблема."
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55
 msgid "Unexpected Exception"
 msgstr "Неочаквана грешка"
 
-#: ../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 "Моля, съобщете за грешката на адрес {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 ""
@@ -7279,5 +7626,5 @@
 "се може по-подробно!)"
 
-#: ../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 "
@@ -7287,9 +7634,9 @@
 "да съобщите за грешка."
 
-#: ../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 "Прикрепете следната информация към репорта ви:"
 
-#: ../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 "(Текста вече е кипиран в буфера за обмен на данни)"
@@ -7377,5 +7724,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 "Описание"
@@ -7757,9 +8104,7 @@
 #: ../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 ""
-"Възникна грешка при опит да се съотнесат снимките към GPX следата. Може да "
-"промените настройките на ръчно съотнасяне на снимки."
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:853
@@ -7791,5 +8136,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"
@@ -7812,5 +8156,5 @@
 msgstr "Ламбертова зона 4 кеш файл (.4)"
 
-#: ../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
@@ -7905,6 +8249,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/"
@@ -7993,6 +8337,6 @@
 msgstr "Добавяне на \"source=...\" към ?"
 
-#: ../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
@@ -8000,11 +8344,11 @@
 msgstr "Сваляне {0}"
 
-#: ../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 "Свързване с WMS Сървър..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:157
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:158
 msgid "Create buildings"
 msgstr "Създаване на сгради"
@@ -8023,13 +8367,13 @@
 msgstr "Моля, включете авто-източниците и проверете cadastre millesime."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:61
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:62
 msgid "Extract SVG ViewBox..."
 msgstr "Екстракт SVG ViewBox..."
 
-#: ../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 "Създаване на граница"
@@ -8050,5 +8394,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 "Зареждане на изображение от френски кадастърен WMS"
 
@@ -8146,5 +8490,5 @@
 "един от тях първо, после опитайте отново."
 
-#: ../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
@@ -8152,59 +8496,28 @@
 msgstr "Празен слой"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:176
 #, java-format
 msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr "WMS слой ({0}), {1} квадрант(и) зареден(и)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:183
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:178
 msgid "Is not vectorized."
 msgstr "Не е векоторизиран."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:179
 #, java-format
 msgid "Raster center: {0}"
 msgstr "Център на растера: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181
 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 "Комуна bbox: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:282
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
-msgid "Save WMS layer to file"
-msgstr "Запис на WMS слоя във файл"
-
-#: ../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 "Зареждане на WMS слой от файл"
-
-#: ../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 "Неподдъжана WMS файлова версия; намерена {0}, очаквана {1}"
-
-#: ../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 ""
@@ -8215,15 +8528,14 @@
 "Моля, създайте нов кеш."
 
-#: ../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 ""
-"Ламбертова зона {0} в кеша е несъвместима с текущата Ламбертова зона {1}"
-
-#: ../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 "Грешка в кеширането на Ламбертовата зона"
@@ -8318,11 +8630,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 "Импортиране на път от GPX слой"
 
 #: ../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 "Височина на съществуващ път"
@@ -8332,5 +8644,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 "Не е открит слой с GPX данни."
@@ -8621,4 +8933,8 @@
 msgid "Lakewalker trace"
 msgstr "Lakewalker трасиране"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:10
+msgid "An unknown error has occurred"
+msgstr ""
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
@@ -8943,43 +9259,43 @@
 msgstr "LiveGPS"
 
-#: ../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 "Слой за провеждане на измервания"
@@ -9040,6 +9356,6 @@
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
-msgid "Open the OpenStreetBugs window and activate the automatic download"
-msgstr "Отворяне на OpenStreetBugs прозорец и активирай автоматичното сваляне"
+msgid "Opens the OpenStreetBugs window and activates the automatic download"
+msgstr ""
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:123
@@ -9118,5 +9434,5 @@
 msgstr "Osmarender"
 
-#: ../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 "
@@ -9126,9 +9442,9 @@
 "\"Картови настройки\" (Map Settings) от настройките."
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:123
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:127
 msgid "osmarender options"
 msgstr "osmarender опции"
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:124
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:128
 msgid "Firefox executable"
 msgstr "изпълним файл на Firefox"
@@ -9567,5 +9883,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 "Име на улица"
@@ -9661,6 +9977,6 @@
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:195
-msgid "No intersections found. Nothing was changed."
-msgstr "Не са открити пресичания. Нищо не е променяно."
+msgid "No intersection found. Nothing was changed."
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:217
@@ -10549,42 +10865,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 ""
-"Можете да добавяте, редактирате или изтривате WMS елементи в WMS plugin "
-"Preference Tab - те ще се появят в меню WMS.\n"
-"\n"
-"Можете да направите това и ръчно в \"Разширени Настройки\" (Advanced "
-"Preferences), използвайки следната схема:\n"
-"wmsplugin.url.1.name=Landsat\n"
-"wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n"
-"wmsplugin.url.2.name=NPE Maps... etc\n"
-"\n"
-"Примен на пълен WMS URL входен формат (landsat)\n"
-"http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n"
-"layers=global_mosaic&styles=&srs=EPSG:4326&\n"
-"format=image/jpeg \n"
-"\n"
-"За Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , ще се "
-"нуждаете да въведете съответно подходящо 'id'.\n"
-"За да добавите Metacarta Map Rectifier меню елемент, ръчно създайте URL по "
-"примера по-долу, заменяйки 73 с вашето 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"
-"Note: Гледайте изображенията да са подходящи, освободени от copyright "
-"ограничения, ако има съмнения, по-добре не използвайте."
-
-#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:54
+
+#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:53
 msgid "WMS Plugin Help"
 msgstr "Помощ за модула WMS"
@@ -10643,5 +10935,5 @@
 msgstr "Настройте позицията на избрания WMS слой"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113
 #, java-format
 msgid ""
@@ -10688,4 +10980,29 @@
 msgid "Alpha channel"
 msgstr "Алфа канал"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
+msgid "Save WMS layer to file"
+msgstr "Запис на WMS слоя във файл"
+
+#: ../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 "Зареждане на WMS слой от файл"
+
+#: ../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 "Неподдъжана WMS файлова версия; намерена {0}, очаквана {1}"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:335
+msgid "File Format Error"
+msgstr "Грешка във формата на файла"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:163
@@ -10780,4 +11097,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 "Трябва да направите редакциите си публични за да качвате нови данни"
@@ -10794,5 +11116,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 "Специален handler за френския поземлен регистър WMS сървър."
 
@@ -11113,5 +11435,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 "Означение"
@@ -11613,5 +11935,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 "Ширина (метри)"
@@ -12080,7 +12402,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 "Тип"
@@ -12696,10 +13018,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 "Оператор"
@@ -12911,7 +13233,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 "Надморска височина"
@@ -13843,5 +14165,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 "Такса"
@@ -13977,5 +14299,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 "Референция (коловоз #)"
@@ -13983,5 +14305,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 "Област"
@@ -14033,11 +14355,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 "Редактирай автобусна платформа"
@@ -14045,5 +14377,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1512
+#: build/trans_presets.java:1513
 msgid "Taxi"
 msgstr "Такси"
@@ -14051,5 +14383,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 "Редактирай стоянка таксита"
@@ -14057,5 +14389,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1519
+#: build/trans_presets.java:1520
 msgid "Airport"
 msgstr "Летище"
@@ -14063,15 +14395,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 "IATA"
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1527
+#: build/trans_presets.java:1528
 msgid "ICAO"
 msgstr "ICAO"
@@ -14080,5 +14412,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1532
+#: build/trans_presets.java:1533
 msgid "Accomodation"
 msgstr "Настаняване"
@@ -14090,5 +14422,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 "Хотел"
@@ -14097,15 +14429,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 "Мотел"
@@ -14113,20 +14445,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 "Бунгало"
@@ -14134,10 +14466,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 "Хостел / студентско общежитие"
@@ -14145,30 +14477,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 "Къмпинг"
@@ -14176,10 +14508,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 "Храна и напитки"
@@ -14190,5 +14522,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 "Ресторант"
@@ -14196,5 +14528,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 "Редактирай ресторант"
@@ -14202,5 +14534,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 "Кухня"
@@ -14208,61 +14540,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 "Заведение за бързо хранене"
@@ -14270,9 +14602,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 "Кафене"
@@ -14280,10 +14612,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 "Бар"
@@ -14291,20 +14623,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 "Бар"
@@ -14312,10 +14644,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 "Нощен клуб"
@@ -14323,20 +14655,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 "Редактирай забележилтеност"
@@ -14345,11 +14677,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 "Музей"
@@ -14357,10 +14689,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 "Зоопарк"
@@ -14369,10 +14701,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 "Място с добра гледка"
@@ -14380,25 +14712,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 "Творба на изкуството"
@@ -14406,5 +14738,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 "Редактирай творба на изкуството"
@@ -14412,5 +14744,5 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1667
 msgid "Information Office"
 msgstr "Информационен пункт"
@@ -14418,83 +14750,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 "Карта"
+
 #. 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 "Редактирай навес"
@@ -14502,25 +14831,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 "Замък"
@@ -14529,20 +14858,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 "Архиологични разкопки"
@@ -14551,10 +14880,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 "Поле на битка"
@@ -14562,5 +14891,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 "Редактирай поле на битка"
@@ -14568,15 +14897,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 "Паметник"
@@ -14584,45 +14913,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 "Площадка"
@@ -14630,15 +14959,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 "Редактирай риболов"
@@ -14646,15 +14975,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 "Редактирай стадион"
@@ -14668,6 +14997,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 "вид спорт:"
@@ -15043,6 +15372,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
@@ -15075,227 +15404,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 "Редактирай многобой"
@@ -15334,191 +15663,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 "Ски"
@@ -15526,56 +15855,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 "Трудност"
 
 #. 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 "лесно"
 
-#: 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 "експерт"
 
-#: 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 "Стрелба"
@@ -15583,178 +15912,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 "Бейсбол"
 
 #. item
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:1960
 msgid "Edit Baseball"
 msgstr "Редактирай бейсбол"
 
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:1965
 msgid "Basketball"
 msgstr "Баскетбол"
 
 #. item
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:1966
 msgid "Edit Basketball"
 msgstr "Редактирай баскетбол"
 
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:1971
 msgid "Golf"
 msgstr "Голф"
 
 #. 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 "Игра с асим.мет.топки (bowls)"
 
 #. 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 "Крикет"
 
 #. item
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:1990
 msgid "Edit Cricket"
 msgstr "Редактирай крикет"
 
-#: 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 "Ръгби"
 
 #. item
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2026
 msgid "Edit Rugby"
 msgstr "Редактирай ръгби"
 
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:2031
 msgid "Table Tennis"
 msgstr "Тенис на маса"
 
 #. item
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2032
 msgid "Edit Table Tennis"
 msgstr "Редактирай тенис на маса"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2037
 msgid "Tennis"
 msgstr "Тенис"
 
 #. item
-#: build/trans_presets.java:2037
+#: build/trans_presets.java:2038
 msgid "Edit Tennis"
 msgstr "Редактирай тенис"
 
 #. <separator/>
-#: build/trans_presets.java:2044
+#: build/trans_presets.java:2045
 msgid "Buildings"
 msgstr "Сгради"
 
 #. group "Buildings"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2046
 msgid "Building"
 msgstr "Строеж"
@@ -15762,5 +16091,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2049
 msgid "Public Building"
 msgstr "Обществена сграда"
@@ -15768,10 +16097,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 "Кметство"
@@ -15779,10 +16108,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 "Редактирай кметство"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2061
 msgid "Embassy"
 msgstr "Посолство"
@@ -15790,10 +16119,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 "Редактирай посолство"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2066
+#: build/trans_presets.java:2067
 msgid "Courthouse"
 msgstr "Съдебна сграда"
@@ -15802,10 +16131,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 "Редактирай съдебна сграда"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2074
 msgid "Prison"
 msgstr "Затвор"
@@ -15814,10 +16143,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 "Редактирай затвор"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2080
+#: build/trans_presets.java:2081
 msgid "Police"
 msgstr "Полиция/Милиция"
@@ -15827,10 +16156,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 "Редактирай полиция/милиция"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2089
 msgid "Fire Station"
 msgstr "Пожарна"
@@ -15839,10 +16168,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 "Редактирай пожарна"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2096
 msgid "Post Office"
 msgstr "Пощенска станция"
@@ -15850,5 +16179,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 "Редактирай пощенска станция"
@@ -15856,15 +16185,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2103
 msgid "Kindergarten"
 msgstr "Детска градина"
 
 #. item
-#: build/trans_presets.java:2103
+#: build/trans_presets.java:2104
 msgid "Edit Kindergarten"
 msgstr "Редактирай детска градина"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2108
 msgid "School"
 msgstr "Училище"
@@ -15872,10 +16201,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 "Редактирай училището"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2114
 msgid "University"
 msgstr "Университет"
@@ -15883,10 +16212,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 "Редактирай университет"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2120
 msgid "College"
 msgstr "Колеж"
@@ -15894,5 +16223,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 "Редактирай колеж"
@@ -15900,5 +16229,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2126
+#: build/trans_presets.java:2127
 msgid "Cinema"
 msgstr "Кино"
@@ -15907,10 +16236,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 "Редактирай кино"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2133
+#: build/trans_presets.java:2134
 msgid "Library"
 msgstr "Библиотека"
@@ -15919,10 +16248,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 "Редактирай библиотека"
 
 #. item "Buildings/Library" text "Name"
-#: build/trans_presets.java:2140
+#: build/trans_presets.java:2141
 msgid "Arts Centre"
 msgstr "Център на изкуствата"
@@ -15930,10 +16259,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 "Театър"
@@ -15942,10 +16271,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 "Редактирай театър"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2154
 msgid "Place of Worship"
 msgstr "Място за богослужение"
@@ -15955,5 +16284,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 "Редактирай място за богослужение"
@@ -15962,6 +16291,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 "Религия"
@@ -15970,66 +16299,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 "Будизъм"
 
-#: 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 "Християнство"
 
-#: 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 "Индуизъм"
 
-#: 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 "Юдаизъм"
 
-#: 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 "Мусулманство"
 
-#: 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 "Сикхизъм"
 
-#: 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 "Спиритуализъм"
 
-#: 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 "Даосизъм"
 
-#: 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 "Зороастризъм"
 
-#: 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 "Конфесия"
@@ -16038,81 +16367,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 "Англиканска"
 
-#: 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 "Баптизъм"
 
-#: 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 "Католическо"
 
-#: 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 "Евангелска"
 
-#: 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 "Свидетели на Йехова"
 
-#: 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 "Лютеранство"
 
-#: 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 "Методизъм"
 
-#: 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 "Мормони"
 
-#: 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 "Православие"
 
-#: 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 "Петдесетници"
 
-#: 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 "Пресвитериани"
 
-#: 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 "Протестантизъм"
 
-#: 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 "Кваркери"
 
-#: 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 "Адреси"
@@ -16121,5 +16450,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 "Редактиране на информацията за адреса"
@@ -16127,5 +16456,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2169
+#: build/trans_presets.java:2170
 msgid "House number"
 msgstr "Номер"
@@ -16133,20 +16462,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2172
 msgid "House name"
 msgstr "Име на дом"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2174
 msgid "City name"
 msgstr "Име на град"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2174
+#: build/trans_presets.java:2175
 msgid "Post code"
 msgstr "Пощенски код"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2176
 msgid "Country code"
 msgstr "Код на държава"
@@ -16154,5 +16483,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2179
 msgid "Address Interpolation"
 msgstr "Интерполация на адреси"
@@ -16161,5 +16490,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 "Редактирай интерполация на адреси"
@@ -16167,71 +16496,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 "нечетни"
 
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2184
 msgid "even"
 msgstr "четни"
 
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2184
 msgid "all"
 msgstr "всички"
 
-#: 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 "Изкуствени"
 
 #. group "Man Made"
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2188
 msgid "Works"
 msgstr "Цех"
 
 #. item
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2189
 msgid "Edit Works"
 msgstr "Редактирай цех"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2193
 msgid "Tower"
 msgstr "Кула"
 
 #. item
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2194
 msgid "Edit Tower"
 msgstr "Редактирай кула"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2198
 msgid "Water Tower"
 msgstr "Водонапорна кула"
 
 #. item
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2199
 msgid "Edit Water Tower"
 msgstr "Редактирай водонапорна кула"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2203
 msgid "Gasometer"
 msgstr "Газохранилище"
 
 #. item
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2204
 msgid "Edit Gasometer"
 msgstr "Редактирай газохранилище"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2207
+#: build/trans_presets.java:2208
 msgid "Lighthouse"
 msgstr "Маяк / Светлинен фар"
@@ -16239,10 +16568,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 "Редактирай маяк / светлинен фар"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2214
 msgid "Windmill"
 msgstr "Мелница"
@@ -16250,10 +16579,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 "Редактирай мелница"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2220
 msgid "Pipeline"
 msgstr "Тръбопровод"
@@ -16261,10 +16590,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 "Редактирай газопровод"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2225
+#: build/trans_presets.java:2226
 msgid "Wastewater Plant"
 msgstr "Пречиствателна станция"
@@ -16274,10 +16603,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 "Кран"
@@ -16285,10 +16614,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 "Редактирай кран"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2239
+#: build/trans_presets.java:2240
 msgid "Beacon"
 msgstr "Маяк / Радиопредавател"
@@ -16296,10 +16625,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 "Редактирай маяк / радиопредавател"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2245
+#: build/trans_presets.java:2246
 msgid "Survey Point"
 msgstr "Точка на наблюдение"
@@ -16307,10 +16636,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 "Редактирай точка на наблюдение"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2252
 msgid "Surveillance"
 msgstr "Видеонаблюдение"
@@ -16318,5 +16647,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 "Редактирай видеонаблюдение"
@@ -16324,5 +16653,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2258
+#: build/trans_presets.java:2259
 msgid "Power Generator"
 msgstr "Електроцентрала"
@@ -16332,39 +16661,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 "Редактирай електрогенератор"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "wind"
 msgstr "вятърна енергия"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "hydro"
 msgstr "водна енергия"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "fossil"
 msgstr "енергия от изкопаеми горива"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "nuclear"
 msgstr "атомна"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "coal"
 msgstr "въглища"
 
-#: 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 "газ"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2268
 msgid "Power Station"
 msgstr "Електростанция"
@@ -16373,10 +16702,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 "Редактирай електростанция"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2274
+#: build/trans_presets.java:2275
 msgid "Power Sub Station"
 msgstr "Електроподстанция"
@@ -16385,5 +16714,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 "Редактирай електроподстанция"
@@ -16391,10 +16720,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 "Електрически стълб от ЕПМ"
@@ -16405,5 +16734,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 "Редактирай стълб от ЕПМ"
@@ -16411,5 +16740,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 "Линия за електропренос"
@@ -16418,25 +16747,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 "Волтаж"
 
 #. 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 "Тоалетни"
@@ -16444,20 +16773,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 "Ref номер"
 
 #. 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 "Забележка"
 
 #. 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 "Телефон"
@@ -16466,5 +16795,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 "Редактирай телефон"
@@ -16472,5 +16801,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 "Монети"
@@ -16478,5 +16807,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 "Банкноти"
@@ -16484,5 +16813,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 "Електрони средства за разплата"
@@ -16490,5 +16819,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 "Дебитни карти"
@@ -16496,15 +16825,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 "Кредитни карти"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2328
 msgid "Telephone cards"
 msgstr "Телефонни карти"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2330
 msgid "Recycling"
 msgstr "Рециклиране"
@@ -16513,5 +16842,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 "Редактиране на станция за рециклиране"
@@ -16519,35 +16848,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 "Батерии"
 
 #. 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 "Дрехи"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2338
 msgid "Glass"
 msgstr "Стъкло"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2339
 msgid "Paper"
 msgstr "Хартия"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2340
 msgid "Scrap Metal"
 msgstr "Вторични суровини"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2342
 msgid "Bench"
 msgstr "Скамейка"
@@ -16556,20 +16885,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 "Ловно скривалище"
 
 #. item
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2347
 msgid "Edit Hunting Stand"
 msgstr "Редактирай ловно скривалище"
 
 #. item "Amenities/Hunting Stand" check "Shelter"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2350
 msgid "Hide"
 msgstr "Скривалище"
 
 #. item "Amenities/Hunting Stand" check "Hide"
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2351
 msgid "Lock"
 msgstr "Заключване"
@@ -16577,22 +16906,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 "Височина"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2351
+#: build/trans_presets.java:2352
 msgid "low"
 msgstr "нисък"
 
-#: build/trans_presets.java:2351
+#: build/trans_presets.java:2352
 msgid "half"
 msgstr "среден"
 
-#: build/trans_presets.java:2351
+#: build/trans_presets.java:2352
 msgid "full"
 msgstr "пълен"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2354
 msgid "Fountain"
 msgstr "Фонтан"
@@ -16601,10 +16930,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 "Редактирай фонтан"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2361
 msgid "Drinking Water"
 msgstr "Питейна вода"
@@ -16613,10 +16942,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 "Редактирай питейна вода"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2367
+#: build/trans_presets.java:2368
 msgid "Baby Hatch"
 msgstr "Дестка ясла"
@@ -16624,25 +16953,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 "Магазини"
 
 #. group "Shops"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2377
 msgid "Supermarket"
 msgstr "Супермаркет"
 
 #. item
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2378
 msgid "Edit Supermarket"
 msgstr "Редактирай супермаркет"
 
 #. item "Shops/Supermarket" text "Name"
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:2382
 msgid "Convenience Store"
 msgstr "Бакалия"
@@ -16650,10 +16979,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 "Будка"
@@ -16661,10 +16990,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 "Редактирай будка"
 
 #. item "Shops/Kiosk" text "Name"
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2394
 msgid "Vending machine"
 msgstr "Автомат за стоки"
@@ -16672,5 +17001,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 "Редактирай автомат за стоки"
@@ -16678,88 +17007,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 "билети за обществен транспорт"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "public_transport_plans"
 msgstr "карта на обществен транспорт"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "parking_tickets"
 msgstr "билети за паркиране"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "food"
 msgstr "храна"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "drinks"
 msgstr "напитки"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "sweets"
 msgstr "сладки"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "cigarettes"
 msgstr "цигари"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "photos"
 msgstr "фотографии"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "animal_food"
 msgstr "храна за животни"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "news_papers"
 msgstr "вестници"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "toys"
 msgstr "играчки"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "stamps"
 msgstr "пощенски марки"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "SIM-cards"
 msgstr "SIM-карти"
 
-#: 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 "презервативи"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "tampons"
 msgstr "тампони"
 
-#: 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 "Месарница"
@@ -16767,10 +17096,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 "Редактирай месарница"
 
 #. item "Shops/Butcher" text "Name"
-#: build/trans_presets.java:2414
+#: build/trans_presets.java:2415
 msgid "Baker"
 msgstr "Фурна"
@@ -16778,10 +17107,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 "Редактирай фурна"
 
 #. item "Shops/Baker" text "Name"
-#: build/trans_presets.java:2420
+#: build/trans_presets.java:2421
 msgid "Florist"
 msgstr "Цветарски магазин"
@@ -16789,20 +17118,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 "Редактирай цветарски магазин"
 
 #. 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 "Алкохол"
@@ -16810,60 +17139,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 "Напитки"
 
 #. 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 "Компютри"
 
 #. item
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2444
 msgid "Edit Computer Shop"
 msgstr "Редактирай компютърен магазин"
 
 #. item "Shops/Computer" text "Name"
-#: build/trans_presets.java:2447
+#: build/trans_presets.java:2448
 msgid "Electronics"
 msgstr "Електроника"
 
 #. item
-#: build/trans_presets.java:2448
+#: build/trans_presets.java:2449
 msgid "Edit Electronics Shop"
 msgstr "Редактирай магазин за електроника"
 
 #. item "Shops/Electronics" text "Name"
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2453
 msgid "Hifi"
 msgstr "Аудио HiFi"
 
 #. item
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2454
 msgid "Edit Hifi Shop"
 msgstr "Редактирай магазин за Аудио HiFi"
 
 #. item "Shops/Hifi" text "Name"
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2458
 msgid "Furniture"
 msgstr "Мебелен магазин"
 
 #. item
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2459
 msgid "Edit Furniture Shop"
 msgstr "Редактирай мебелен магазин"
 
 #. item "Shops/Furniture" text "Name"
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2463
 msgid "Garden Centre"
 msgstr "Градински център"
@@ -16871,10 +17200,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 "Редактирай градински център"
 
 #. item "Shops/Garden Centre" text "Name"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2469
 msgid "Hardware"
 msgstr "Железария"
@@ -16882,10 +17211,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 "Редактирай железария"
 
 #. item "Shops/Hardware" text "Name"
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2475
 msgid "Do-it-yourself-store"
 msgstr "Магазин \"Направи си сам\""
@@ -16893,60 +17222,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 "Книжарница"
 
 #. item
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2482
 msgid "Edit Stationery Shop"
 msgstr "Редактирай книжарница"
 
 #. item "Shops/Stationery" text "Name"
-#: build/trans_presets.java:2485
+#: build/trans_presets.java:2486
 msgid "Hairdresser"
 msgstr "Фризьорски салон / козметика"
 
 #. item
-#: build/trans_presets.java:2486
+#: build/trans_presets.java:2487
 msgid "Edit Hairdresser"
 msgstr "Редактирай фризьорски салон / козметика"
 
 #. item "Shops/Hairdresser" text "Name"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2491
 msgid "Shoes"
 msgstr "Обувки"
 
 #. item
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2492
 msgid "Edit Shoe Shop"
 msgstr "Редактирай магазин за обувки"
 
 #. item "Shops/Shoes" text "Name"
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2496
 msgid "Toys"
 msgstr "Играчки"
 
 #. item
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2497
 msgid "Edit Toy Shop"
 msgstr "Редактирай магазин за играчки"
 
 #. item "Shops/Toys" text "Name"
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2501
 msgid "Video"
 msgstr "Видео"
 
 #. item
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2502
 msgid "Edit Video Shop"
 msgstr "Редактирай Видео-магазин"
 
 #. item "Shops/Video" text "Name"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2506
 msgid "Dry Cleaning"
 msgstr "Химическо чистене"
@@ -16954,10 +17283,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 "Редактирай химическо чистене"
 
 #. item "Shops/Dry Cleaning" text "Name"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2512
 msgid "Laundry"
 msgstr "Пералня"
@@ -16965,10 +17294,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 "Редактирай пералня"
 
 #. item "Shops/Laundry" text "Name"
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2518
 msgid "Outdoor"
 msgstr "Туристически стоки (за активен отдих)"
@@ -16976,35 +17305,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 "Редактирай мазизин за туристически стоки"
 
 #. item "Shops/Outdoor" text "Name"
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2524
 msgid "Sports"
 msgstr "Спортни стоки"
 
 #. item
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2525
 msgid "Edit Sports Shop"
 msgstr "Редактирай магазин за спортни стоки"
 
 #. item "Shops/Sports" text "Name"
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2529
 msgid "Optician"
 msgstr "Оптика"
 
 #. item
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2530
 msgid "Edit Optician"
 msgstr "Редактирай оптика"
 
 #. item "Shops/Optician" text "Name"
-#: build/trans_presets.java:2535
+#: build/trans_presets.java:2536
 msgid "Cash"
 msgstr "Пари"
 
 #. group "Cash"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2537
 msgid "Bank"
 msgstr "Банка"
@@ -17012,5 +17341,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 "Редактирай банка"
@@ -17018,10 +17347,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 "Банкомат"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2544
 msgid "Money Exchange"
 msgstr "Обмяна на валута"
@@ -17029,5 +17358,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 "Редактирай обмяна на валута"
@@ -17035,15 +17364,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 "Редактирай банкомат"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2557
 msgid "Health"
 msgstr "Здраве"
 
 #. group "Health"
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2558
 msgid "Doctors"
 msgstr "Доктори"
@@ -17051,20 +17380,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 "Редактирай доктори"
 
 #. item "Health/Doctors" text "Name"
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2564
 msgid "Dentist"
 msgstr "Стоматолог"
 
 #. item
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2565
 msgid "Edit Dentist"
 msgstr "Редактирай стоматолигия"
 
 #. item "Health/Dentist" text "Name"
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2569
 msgid "Pharmacy"
 msgstr "Аптека"
@@ -17072,5 +17401,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 "Редактирай аптека"
@@ -17078,10 +17407,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 "Приготвят лекарства по рецепти"
 
 #. item "Health/Pharmacy" text "Name"
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2576
 msgid "Hospital"
 msgstr "Болница"
@@ -17089,10 +17418,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 "Редактирай болница"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2582
 msgid "Emergency Access Point"
 msgstr "Пункт за връзка със спешна помощ"
@@ -17101,5 +17430,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 "Редактирай пункт за връзка със спешна помощ"
@@ -17108,20 +17437,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2588
 msgid "Point Number"
 msgstr "Номер на пункта"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2589
 msgid "Point Name"
 msgstr "Име на пункта"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2591
 msgid "Phone Number"
 msgstr "Телефонен номер"
 
 #. 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 "(Използвайте международен код, като например +12-345-67890)"
@@ -17129,5 +17458,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 "Ветеринар"
@@ -17136,25 +17465,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 "Редактирай ветеринар"
 
 #. group "Places"
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2605
 msgid "Continent"
 msgstr "Континент"
 
 #. item
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2606
 msgid "Edit Continent"
 msgstr "Редактирай континент"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2611
 msgid "Country"
 msgstr "Държава"
 
 #. item
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2612
 msgid "Edit Country"
 msgstr "Редактирай държава"
@@ -17162,30 +17491,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 "Област/Щат"
 
 #. item
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2618
 msgid "Edit State"
 msgstr "Редактирай област/щат"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2622
+#: build/trans_presets.java:2623
 msgid "Region"
 msgstr "Област"
 
 #. item
-#: build/trans_presets.java:2623
+#: build/trans_presets.java:2624
 msgid "Edit Region"
 msgstr "Редактирай област"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2628
+#: build/trans_presets.java:2629
 msgid "County"
 msgstr "Графство"
 
 #. item
-#: build/trans_presets.java:2629
+#: build/trans_presets.java:2630
 msgid "Edit County"
 msgstr "Редактирай графство"
@@ -17193,15 +17522,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2635
+#: build/trans_presets.java:2636
 msgid "City"
 msgstr "Град (над 100 000)"
 
 #. item
-#: build/trans_presets.java:2636
+#: build/trans_presets.java:2637
 msgid "Edit City"
 msgstr "Редактирай голям град"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2641
+#: build/trans_presets.java:2642
 msgid "Town"
 msgstr "Град (под 100 000)"
@@ -17209,10 +17538,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 "Редактирай град"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2649
 msgid "Suburb"
 msgstr "Квартал/предградие"
@@ -17220,25 +17549,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 "Редактирай квартал"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2656
 msgid "Village"
 msgstr "Село"
 
 #. item
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2657
 msgid "Edit Village"
 msgstr "Редактирай село"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2662
 msgid "Hamlet"
 msgstr "Махала"
 
 #. item
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2663
 msgid "Edit Hamlet"
 msgstr "Редактирай махала"
@@ -17246,5 +17575,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2669
 msgid "Locality"
 msgstr "Местност"
@@ -17252,10 +17581,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 "Редактирай местност"
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2676
 msgid "Island"
 msgstr "Остров"
@@ -17263,5 +17592,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 "Редактирай остров"
@@ -17269,5 +17598,5 @@
 #. item "Places/Island" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2683
+#: build/trans_presets.java:2684
 msgid "Cave Entrance"
 msgstr "Пещерен вход"
@@ -17275,10 +17604,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 "Редактиране пещерен вход"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2690
 msgid "Peak"
 msgstr "Връх"
@@ -17286,10 +17615,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 "Редактиране връх"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2697
 msgid "Glacier"
 msgstr "Ледник"
@@ -17297,10 +17626,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 "Редактиране ледник"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2703
+#: build/trans_presets.java:2704
 msgid "Volcano"
 msgstr "Вулкан"
@@ -17308,70 +17637,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 "Редактиране вулкан"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2711
+#: build/trans_presets.java:2712
 msgid "Boundaries"
 msgstr "Граници"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2713
 msgid "National"
 msgstr "Национална"
 
 #. item
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2714
 msgid "Edit National Boundary"
 msgstr "Редактирай национална граница"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2718
+#: build/trans_presets.java:2719
 msgid "Administrative"
 msgstr "Административна"
 
 #. item
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2720
 msgid "Edit Administrative Boundary"
 msgstr "Редактирай административна граница"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2724
+#: build/trans_presets.java:2725
 msgid "Civil"
 msgstr "Гражданска"
 
 #. item
-#: build/trans_presets.java:2725
+#: build/trans_presets.java:2726
 msgid "Edit Civil Boundary"
 msgstr "Редактирай гражданска граница"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2730
+#: build/trans_presets.java:2731
 msgid "Political"
 msgstr "Политическа"
 
 #. item
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:2732
 msgid "Edit Political Boundary"
 msgstr "Редактирай политическа граница"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2736
+#: build/trans_presets.java:2737
 msgid "National park"
 msgstr "Национален парк"
 
 #. item
-#: build/trans_presets.java:2737
+#: build/trans_presets.java:2738
 msgid "Edit National Park Boundary"
 msgstr "Редактирай граница национален парк"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2744
 msgid "Land use"
 msgstr "Земеползване"
 
 #. group "Land use"
-#: build/trans_presets.java:2744
+#: build/trans_presets.java:2745
 msgid "Tree"
 msgstr "Дърво"
@@ -17380,15 +17709,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 "Редактирай дърво"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2753
 msgid "Botanical Name"
 msgstr "Ботаническо название"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2755
 msgid "Wood"
 msgstr "Гора"
@@ -17397,5 +17726,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 "Редактирай гората"
@@ -17403,17 +17732,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 "иглолистен"
 
-#: build/trans_presets.java:2760 build/trans_presets.java:2769
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
 msgid "deciduous"
 msgstr "широколистен"
 
-#: build/trans_presets.java:2760 build/trans_presets.java:2769
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
 msgid "mixed"
 msgstr "смесен"
 
-#: build/trans_presets.java:2762
+#: build/trans_presets.java:2763
 msgid "Forest"
 msgstr "Гора"
@@ -17422,14 +17751,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 "Редактирай гора"
 
-#: build/trans_presets.java:2771
+#: build/trans_presets.java:2772
 msgid "Nature Reserve"
 msgstr "Природен резерват"
 
 #. item
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2773
 msgid "Edit Nature Reserve"
 msgstr "Редактирай природен резерват"
@@ -17437,25 +17766,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2777
+#: build/trans_presets.java:2778
 msgid "Scree"
 msgstr "Сипей"
 
 #. item
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:2779
 msgid "Edit Scree"
 msgstr "Редактирай сипей"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2783
 msgid "Scrub"
 msgstr "Шубрак"
 
 #. item
-#: build/trans_presets.java:2783
+#: build/trans_presets.java:2784
 msgid "Edit Scrub"
 msgstr "Редактирай шубрака"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2788
 msgid "Fell"
 msgstr "Скалист склон"
@@ -17463,10 +17792,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 "Редактирай скалист склон"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2794
 msgid "Heath"
 msgstr "Пустош"
@@ -17474,5 +17803,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 "Редактиране пустош"
@@ -17480,5 +17809,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2801
 msgid "Farmyard"
 msgstr "Двор ферма"
@@ -17487,45 +17816,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 "Редактирай двор ферма"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2808
+#: build/trans_presets.java:2809
 msgid "Farmland"
 msgstr "Обработваема земя"
 
 #. item
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2810
 msgid "Edit Farmland Landuse"
 msgstr "Редактирай обработваема земя"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2814
+#: build/trans_presets.java:2815
 msgid "Meadow"
 msgstr "Поляна"
 
 #. item
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2816
 msgid "Edit Meadow Landuse"
 msgstr "Редактиране поляна"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2820
+#: build/trans_presets.java:2821
 msgid "Vineyard"
 msgstr "Лозе"
 
 #. item
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2822
 msgid "Edit Vineyard Landuse"
 msgstr "Редактирай лозе"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2826
+#: build/trans_presets.java:2827
 msgid "Allotments"
 msgstr "Общинска земя"
 
 #. item
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:2828
 msgid "Edit Allotments Landuse"
 msgstr "Редактирай общинска земя"
@@ -17533,25 +17862,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2833
+#: build/trans_presets.java:2834
 msgid "Garden"
 msgstr "Градина"
 
 #. item
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2835
 msgid "Edit Garden"
 msgstr "Редактирай градина"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2838
+#: build/trans_presets.java:2839
 msgid "Grass"
 msgstr "Трева"
 
 #. item
-#: build/trans_presets.java:2839
+#: build/trans_presets.java:2840
 msgid "Edit Grass Landuse"
 msgstr "Редактирай трева"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2845
 msgid "Village Green"
 msgstr "Зелено село"
@@ -17559,10 +17888,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 "Редактирай зелено селище"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:2852
 msgid "Common"
 msgstr "Общи"
@@ -17570,20 +17899,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 "Редактирай общи"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2858
 msgid "Park"
 msgstr "Парк"
 
 #. item
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:2859
 msgid "Edit Park"
 msgstr "Редактирай парк"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2863
 msgid "Recreation Ground"
 msgstr "Спортна площадка"
@@ -17591,5 +17920,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 "Редактирай спортна площадка"
@@ -17597,15 +17926,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2871
 msgid "Residential area"
 msgstr "Жилищна зона"
 
 #. item
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2872
 msgid "Edit Residential Landuse"
 msgstr "Редактирай жилищна зона"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2877
 msgid "Graveyard"
 msgstr "Църковно гробище"
@@ -17613,9 +17942,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 "Редактирай църковно гробище"
 
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:2885
 msgid "Cemetery"
 msgstr "Гробище"
@@ -17623,39 +17952,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 "Редактирай гробище"
 
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2894
 msgid "Retail"
 msgstr "Търговия на дребно"
 
 #. item
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2895
 msgid "Edit Retail Landuse"
 msgstr "Редактирай търговия на дребно"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2900
 msgid "Commercial"
 msgstr "Търговия"
 
 #. item
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2901
 msgid "Edit Commercial Landuse"
 msgstr "Редактирай търговия"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2906
 msgid "Industrial"
 msgstr "Промишленост"
 
 #. item
-#: build/trans_presets.java:2906
+#: build/trans_presets.java:2907
 msgid "Edit Industrial Landuse"
 msgstr "Редактирай промишленост"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2912
 msgid "Railway land"
 msgstr "Железопътен път"
@@ -17663,15 +17992,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 "Редактирай ЖП"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:2919
 msgid "Military"
 msgstr "Военен"
 
 #. item
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2920
 msgid "Edit Military Landuse"
 msgstr "Редакирай военна земя"
@@ -17679,55 +18008,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2925
+#: build/trans_presets.java:2926
 msgid "Construction area"
 msgstr "Строителна площадка"
 
 #. item
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2927
 msgid "Edit Construction Landuse"
 msgstr "Редактирай строителна площадка"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2932
 msgid "Brownfield"
 msgstr "Индустриални развалини"
 
 #. item
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:2933
 msgid "Edit Brownfield Landuse"
 msgstr "Редактирай ундустриални развалини"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2937
+#: build/trans_presets.java:2938
 msgid "Greenfield"
 msgstr "Зелени площи"
 
 #. item
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:2939
 msgid "Edit Greenfield Landuse"
 msgstr "Редактирай зелени площи"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:2944
 msgid "Landfill"
 msgstr "Сметище"
 
 #. item
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:2945
 msgid "Edit Landfill Landuse"
 msgstr "Редактирай сметище"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2950
 msgid "Quarry"
 msgstr "Кариера"
 
 #. item
-#: build/trans_presets.java:2950
+#: build/trans_presets.java:2951
 msgid "Edit Quarry Landuse"
 msgstr "Редактирай кариера"
 
 #. group "Relations"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2960
 msgid "Multipolygon"
 msgstr "Мултиполигон"
@@ -17737,5 +18066,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 "Редактиране мултиполигон"
@@ -17744,10 +18073,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:2970
 msgid "outer segment"
 msgstr "външен сегмент"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:2970
+#: build/trans_presets.java:2971
 msgid "inner segment"
 msgstr "вътрешен сегмент"
@@ -17755,5 +18084,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:2974
 msgid "Turn restriction"
 msgstr "Ограничения при завиване"
@@ -17762,5 +18091,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 "Редактиране на ограничения при завиване"
@@ -17768,34 +18097,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 "Ограничения"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_left_turn"
 msgstr "забранен ляв завой"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_right_turn"
 msgstr "забранен десен завой"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_straight_on"
 msgstr "забранено напред"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_u_turn"
 msgstr "забранен обратен завой"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "only_right_turn"
 msgstr "само десен завой"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "only_left_turn"
 msgstr "само ляв завой"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "only_straight_on"
 msgstr "само направо"
@@ -17804,15 +18133,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2983
+#: build/trans_presets.java:2984
 msgid "from way"
 msgstr "от път"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2985
 msgid "via node or way"
 msgstr "през точка или път"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2986
 msgid "to way"
 msgstr "до път"
@@ -17820,5 +18149,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:2988
+#: build/trans_presets.java:2989
 msgid "Route"
 msgstr "Маршрут"
@@ -17827,5 +18156,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 "Редактиране маршрут"
@@ -17833,5 +18162,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 "Тип маршрут"
@@ -17903,5 +18232,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
@@ -17910,17 +18239,17 @@
 msgstr "велосипед"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "bus"
 msgstr "автобус"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "road"
 msgstr "път"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "ferry"
 msgstr "ферибот"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "ski"
 msgstr "ски"
@@ -17973,5 +18302,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
@@ -17980,13 +18309,13 @@
 msgstr "пеш"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "hiking"
 msgstr "туристически маршрут"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "tram"
 msgstr "трамваен маршрут"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "detour"
 msgstr "обиколка"
@@ -18000,10 +18329,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 "метро"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:2997
 msgid "Symbol description"
 msgstr "Описание на символ"
@@ -18011,26 +18340,26 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:2999
+#: build/trans_presets.java:3000
 msgid "Network"
 msgstr "Мрежа"
 
 #. item "Relations/Route" combo "State"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "proposed"
 msgstr "предложен"
 
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "alternate"
 msgstr "алтернативен"
 
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "temporary"
 msgstr "временен"
 
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "connection"
 msgstr "връзка"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3003
 msgid "Color (hex)"
 msgstr "Цвят (hex)"
@@ -18039,30 +18368,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:3006
 msgid "route segment"
 msgstr "сегмент от маршрут"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3007
 msgid "forward segment"
 msgstr "сегмент напред"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3008
 msgid "backward segment"
 msgstr "сегмент назад"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3009
 msgid "halt point"
 msgstr "точка за спиране"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3010
 msgid "forward halt point"
 msgstr "точка за спиране напред"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3011
 msgid "backward halt point"
 msgstr "точка за спиране назад"
@@ -22177,7 +22506,19 @@
 msgstr ""
 
+#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
+#~ msgstr "Използвайте мишката или Ctrl+стрелките/./ за мащабиране."
+
 #~ msgid "Uploading data"
 #~ msgstr "Качване на данни"
 
+#~ msgid "Email"
+#~ msgstr "Е-поща"
+
+#~ msgid "Login name (email) to the OSM account."
+#~ msgstr "Потребителско име (email) за OSM акаунт."
+
+#~ msgid "OSM username (email)"
+#~ msgstr "OSM потребителско име (email)"
+
 #~ msgid "Unknown host"
 #~ msgstr "Неизвестен хост"
@@ -22185,4 +22526,11 @@
 #~ msgid "Add either site-josm.xml or Wiki Pages."
 #~ msgstr "Добавяне или на site-josm.xml, или на Wiki страници."
+
+#~ msgid ""
+#~ "Server returned internal error. Try a reduced area or retry after waiting "
+#~ "some time."
+#~ msgstr ""
+#~ "Сървърът върна във вътрешна грешка. Опитайте да намалите областта или "
+#~ "повторете опита си по-късно."
 
 #~ msgid "Commit comment"
@@ -22240,6 +22588,64 @@
 #~ msgstr "Наистина ли искате да маркирате проблема като ''решен''?"
 
+#~ 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 URL.<br><b>Do not use a valuable Password.</b></html>"
+#~ msgstr ""
+#~ "<html>ВНИМАНИЕ: Паролата се съхранява в обиковен текст във файла с "
+#~ "настройките.<br>Паролата се предава като обикновен текст до сървъра, "
+#~ "включена в URL адрес.<br><b>Не използвайте ценна парола.</b></html>"
+
 #~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS"
 #~ msgstr "Сваляне трансформирано изображение от Metacarta's Map Rectifier WMS"
+
+#~ msgid ""
+#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab "
+#~ "- these will then show up in the WMS menu.\n"
+#~ "\n"
+#~ "You can also do this manually in the Advanced Preferences, using the "
+#~ "following schema:\n"
+#~ "wmsplugin.url.1.name=Landsat\n"
+#~ "wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n"
+#~ "wmsplugin.url.2.name=NPE Maps... etc\n"
+#~ "\n"
+#~ "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"
+#~ "\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"
+#~ "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"
+#~ "Note: Make sure the image is suitable, copyright-wise, if in doubt, don't "
+#~ "use."
+#~ msgstr ""
+#~ "Можете да добавяте, редактирате или изтривате WMS елементи в WMS plugin "
+#~ "Preference Tab - те ще се появят в меню WMS.\n"
+#~ "\n"
+#~ "Можете да направите това и ръчно в \"Разширени Настройки\" (Advanced "
+#~ "Preferences), използвайки следната схема:\n"
+#~ "wmsplugin.url.1.name=Landsat\n"
+#~ "wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n"
+#~ "wmsplugin.url.2.name=NPE Maps... etc\n"
+#~ "\n"
+#~ "Примен на пълен WMS URL входен формат (landsat)\n"
+#~ "http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n"
+#~ "layers=global_mosaic&styles=&srs=EPSG:4326&\n"
+#~ "format=image/jpeg \n"
+#~ "\n"
+#~ "За Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , ще се "
+#~ "нуждаете да въведете съответно подходящо 'id'.\n"
+#~ "За да добавите Metacarta Map Rectifier меню елемент, ръчно създайте URL "
+#~ "по примера по-долу, заменяйки 73 с вашето 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"
+#~ "Note: Гледайте изображенията да са подходящи, освободени от copyright "
+#~ "ограничения, ако има съмнения, по-добре не използвайте."
 
 #~ msgid "Portcullis"
@@ -22266,10 +22672,39 @@
 #~ msgstr "виадукт"
 
+#~ msgid "Open the OpenStreetBugs window and activate the automatic download"
+#~ msgstr ""
+#~ "Отворяне на OpenStreetBugs прозорец и активирай автоматичното сваляне"
+
 #~ msgid "sports"
 #~ msgstr "спортни"
 
+#~ msgid ""
+#~ "Lambert zone {0} in cache  incompatible with current Lambert zone {1}"
+#~ msgstr ""
+#~ "Ламбертова зона {0} в кеша е несъвместима с текущата Ламбертова зона {1}"
+
 #~ msgid "Delete and Download"
 #~ msgstr "Изтриване и Зареждане"
 
+#~ msgid "No intersections found. Nothing was changed."
+#~ msgstr "Не са открити пресичания. Нищо не е променяно."
+
+#~ msgid ""
+#~ "This action will require {0} individual download requests. Do you wish to "
+#~ "continue?"
+#~ msgstr ""
+#~ "Това действие ще изисква {0} индивидуални запитвания за сваляне. Желаете "
+#~ "ли да продължите?"
+
+#~ msgid ""
+#~ "An error occured while trying to match the photos to the GPX track. You "
+#~ "can adjust the sliders to manually match the photos."
+#~ msgstr ""
+#~ "Възникна грешка при опит да се съотнесат снимките към GPX следата. Може "
+#~ "да промените настройките на ръчно съотнасяне на снимки."
+
+#~ msgid "The following errors occured during mass download:"
+#~ msgstr "Следните грешки възникнаха при масово сваляне:"
+
 #~ msgid "Edit Drawbridge"
 #~ msgstr "Редактирай подвижен мост"
@@ -22277,4 +22712,15 @@
 #~ msgid "Edit Portcullis"
 #~ msgstr "Редактирай падаща решетка"
+
+#~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">english</A>."
+#~ msgstr ""
+#~ "Липсва страница с помощ. Създайте я на <A HREF=\"{0}\">английски</A>."
+
+#~ msgid ""
+#~ "Helppage missing. Create it in <A HREF=\"{0}\">english</A> or <A HREF="
+#~ "\"{1}\">your language</A>."
+#~ msgstr ""
+#~ "Липсва страница с помощ. Създайте я на <A HREF=\"{0}\">английски</A> или "
+#~ "<A HREF=\"{1}\">на вашия език</A>."
 
 #~ msgid ""
@@ -22296,4 +22742,7 @@
 #~ msgstr "Не е инициализирано"
 
+#~ msgid "Cannot read numeric value from response"
+#~ msgstr "Не може да се прочетат числова стойност от отговора"
+
 #~ msgid "Data upload failed for unknown reason"
 #~ msgstr "Качването на данни неуспя по неизяснена причина"
Index: applications/editors/josm/i18n/po/cs.po
===================================================================
--- applications/editors/josm/i18n/po/cs.po	(revision 16008)
+++ applications/editors/josm/i18n/po/cs.po	(revision 16009)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-14 16:51+0200\n"
-"PO-Revision-Date: 2009-06-12 12:24+0000\n"
-"Last-Translator: hanoj <ehanoj@gmail.com>\n"
+"POT-Creation-Date: 2009-06-19 21:52+0200\n"
+"PO-Revision-Date: 2009-06-18 00:04+0000\n"
+"Last-Translator: punkrtekk <Unknown>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2009-06-14 14:46+0000\n"
+"X-Launchpad-Export-Date: 2009-06-19 19:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -22,16 +22,16 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 msgid "Creating main GUI"
-msgstr "Vytvářím grafické rozhraní programu (GUI)"
+msgstr "Vytváří se grafické rozhraní programu (GUI)"
 
 #. FIXME why is help not a JosmAction?
 #: ../core/src/org/openstreetmap/josm/Main.java:198
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59
-#: ../core/src/org/openstreetmap/josm/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 ""
+msgstr "Pomoc"
 
 #: ../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 ""
 "Druh kartografické projekce nebyl nalezen v souboru s nastavením. Používám "
@@ -72,6 +72,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
@@ -88,8 +90,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
@@ -108,5 +110,5 @@
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
-msgstr "Ignoruji nekorektní URL: \"{0}\""
+msgstr "Ignorují se nekorektní URL: \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/Main.java:391
@@ -138,5 +140,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"
@@ -533,5 +535,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}"
@@ -603,6 +605,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:92
-msgid "Email"
-msgstr "E-mail"
+msgid "E-Mail"
+msgstr "Email"
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:96
@@ -640,12 +642,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
@@ -672,5 +676,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
@@ -703,15 +707,13 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:207
 #, java-format
-msgid "Helppage missing. Create it in <A HREF=\"{0}\">english</A>."
-msgstr "Stránka s nápovědou chybí. Udělej jí v <A HREF=\"{0}\">angličtině</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 ""
-"Stránka s nápovědou chybí. Udělej jí v <A HREF=\"{0}\">angličtině</A> nebo  "
-"<A HREF=\"{1}\">ve tvém jazyce</A>."
 
 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:26
@@ -1029,5 +1031,5 @@
 #, java-format
 msgid "File {0} exists. Overwrite?"
-msgstr ""
+msgstr "Soubor {0} již existuje. Přepsat ?"
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
@@ -1081,5 +1083,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112
 msgid "Save Layer"
-msgstr ""
+msgstr "Ulož vrstvu"
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:122
@@ -1140,13 +1142,13 @@
 msgstr "Nápověda: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:99
 msgid "Status Report"
 msgstr "Zpráva o stavu"
 
-#: ../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 "Zkopírovat do schránky a zavřít"
 
-#: ../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
@@ -1347,16 +1349,14 @@
 msgstr "Odznačit vše (Escape)"
 
-#: ../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 "Aktualizovat data"
 
-#: ../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 "Aktualizuje data v aktuální vrstvě ze serveru (znovu stáhne data)"
 
-#: ../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?"
@@ -1365,87 +1365,258 @@
 "vrstvu?"
 
-#: ../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 "Ne, zruš operaci"
+
+#: ../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 ""
-"Tato akce bude potřebovat {0} jednotlivých stažení dat. Chcete pokračovat?"
-
-#: ../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 "Prázdný výběr"
+
+#: ../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 "Výběr je příliš velký"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
 msgid "Upload to OSM..."
 msgstr "Nahrát do OSM..."
 
-#: ../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 "Nahrát všechy změny na OSM server."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:96
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:94
 msgid "Objects to add:"
 msgstr "Objekty k přidání:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102
 msgid "Objects to modify:"
 msgstr "Objekty ke změnění:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:110
 msgid "Objects to delete:"
 msgstr "Objekty ke smazání:"
 
-#: ../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 "Napište stručný komentář ke změnám, které nahráváte na server:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:126
 msgid "Upload these changes?"
 msgstr "Nahrát tyto úpravy?"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:130
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
 msgid "Upload Changes"
 msgstr "Nahrát změny na server"
 
-#: ../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 "Není nic k nahrání. Nejprve musíte mít nějaká data."
 
-#: ../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 "Jsou zde nevyřešené konflikty. Musíte je nejprve vyřešit."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:182
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:180
 msgid "No changes to upload."
 msgstr "Žádné změny k nahrání."
 
-#: ../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 "Detekován konflikt"
+
+#: ../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 ""
@@ -1550,37 +1721,51 @@
 msgstr "Surová GPS data"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:44
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:46
 msgid "Downloading data"
 msgstr "Stahuji data"
 
-#: ../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 "Nic nebylo importováno"
 
-#: ../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 "Datová vrstva {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 "OpenStreetMap data"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:37
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:45
 msgid "Data Layer"
 msgstr "Vrstva dat"
 
-#: ../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 "Stahuji {0} z {1} ({2} zbývá)"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:88
-msgid "The following errors occured during mass download:"
-msgstr "Následující chyby nastaly při hromadném stahování:"
-
-#: ../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 "Chyby při stahování"
+
+#: ../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
@@ -1633,34 +1818,34 @@
 msgstr "Nemůžu přidat uzel ležící mimo Zemi."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:495
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:493
 msgid "Add node"
 msgstr "Přidat uzel"
 
-#: ../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 "Přidat uzel do cesty"
 
-#: ../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 "Spojit existující cestu do uzlu"
 
-#: ../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 "Přidat nový uzel do již existující cesty"
 
-#: ../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 "Přidat uzel do cesty a spojit"
 
-#: ../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 "Vytvořit nový uzel."
 
-#: ../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 "Vybrat uzel pod kurzorem."
 
-#: ../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."
@@ -1670,14 +1855,14 @@
 msgstr[2] "Vložit nový uzel do {0} cest."
 
-#: ../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 "Začít novou cestu od posledního uzlu."
 
-#: ../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 "Pokračovat v cestě od posledního uzlu."
 
-#: ../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 "Dokončit kreslení"
@@ -1998,26 +2183,32 @@
 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 "Nahrát výběr"
 
-#: ../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 "Kontakt {0}..."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:45
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:46
 msgid "Downloading..."
 msgstr "Stahuji..."
 
-#: ../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 "Nemohu číst z URL:\"{0}\""
 
-#: ../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 "Chyba parsování v URL:\"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:74
+msgid "Error while communicating with server."
+msgstr "Chyba při komunikaci se serverem."
 
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67
@@ -2079,13 +2270,85 @@
 msgstr "Vyřešit {0} konfliktů v {1} objektech"
 
-#: ../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 "Smazat {1} {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97
+#, java-format
+msgid "Delete {0} {1}"
+msgstr "Smazat {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153
+msgid "Conflicting relation"
+msgstr "Konfliktní relace"
+
+#: ../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 ""
+"Výběr \"{0}\" je používán v relaci \"{1}\" s rolí {2}.\n"
+"Smazat z relace?"
+
+#: ../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 "Odstranit z relace"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
+#, java-format
+msgid ""
+"Selection \"{0}\" is used by relation \"{1}\".\n"
+"Delete from relation?"
+msgstr ""
+"Výběr \"{0}\" je používán v relaci \"{1}\".\n"
+"Smazat z relace?"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:366
+msgid "Split way segment"
+msgstr "Rozdělit segment cesty"
+
+#. 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 ""
+"Chystáte se smazat uzly mimo oblast, jež jste stáhli.<br>To může způsobit "
+"problémy, protože jiné objekty (které nevidíte) je mohou používat."
+"<br>Opravdu je chcete smazat?"
+
+#: ../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 "Přesunout"
+
 #: ../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"
@@ -2095,10 +2358,219 @@
 msgstr[2] "uzly"
 
-#: ../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 "Odstranit prvek relace"
+
+#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
+msgid "Rotate"
+msgstr "Otočit"
+
+#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88
+msgid "Sequence"
+msgstr "Sekvence"
+
+#: ../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 "Použít ?"
+
+#: ../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 ""
+"Byl změněn směr cesty. Mají se provést zásledující změny vlastností cesty a "
+"jejích bodů, z důvodů udržení konzistence dat?"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28
+msgid "Relation"
+msgstr "Vztah"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30
+msgid "Old role"
+msgstr "Stará role"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:32
+msgid "New role"
+msgstr "Nová role"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
+msgid "Old key"
+msgstr "Starý klíč"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
+msgid "Old value"
+msgstr "Stará hodnota"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
+msgid "New key"
+msgstr "Nový klíč"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
+msgid "New value"
+msgstr "Nová hodnota"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:40
+msgid "Apply selected changes"
+msgstr "Použít zvolené změny"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41
+msgid "Don't apply changes"
+msgstr "Neprovádět změny"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:83
+msgid "Please select which property changes you want to apply."
+msgstr "Prosím vyberte které změny vlastností chcete použít."
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:96
+msgid "Properties of "
+msgstr "Vlastnosti "
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:120
+msgid "Roles in relations referring to"
+msgstr "Role v relaci odkazující na"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:136
+msgid "Automatic tag correction"
+msgstr "Automatická korekce popisků"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:314
+#, java-format
+msgid "Malformed config file at lines {0}"
+msgstr "Poškozený konfigurační soubor na řádku {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:324
+#, java-format
+msgid "Cannot open preferences directory: {0}"
+msgstr "Nelze otevřít adresář s nastavením: {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 "Soubor s nastavením má chyby. Vytvářím zálohu starého do {0}."
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:79
+#, java-format
+msgid "Preferences stored on {0}"
+msgstr "Předvolby uloženy na {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:82
+#, java-format
+msgid "Could not upload preferences. Reason: {0}"
+msgstr "Nemohu nahrát předvolby. Důvod: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:93
+msgid "Could not load preferences from server."
+msgstr "Nemohu nahrát předvolby ze serveru."
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:34
+msgid "different"
+msgstr "různé"
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:262
+msgid "deleted"
+msgstr "smazáno"
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
+msgid "true"
+msgstr "pravda"
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
+msgid "false"
+msgstr "nepravda"
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20
+msgid "position"
+msgstr "pozice"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30
+msgid "Decimal Degrees"
+msgstr "Desetinné stupně"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
+msgid "Degrees Minutes Seconds"
+msgstr "Stupně minuty sekundy"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+msgid "S"
+msgstr "J"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+msgid "N"
+msgstr "S"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+msgid "W"
+msgstr "Z"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+msgid "E"
+msgstr "V"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/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 "nekompletní"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
+#, java-format
+msgid "Error: {0}"
+msgstr "Chyba: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
+#, java-format
+msgid "Warning: {0}"
+msgstr "Varování: {0}"
+
+#: ../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"
@@ -2108,8 +2580,10 @@
 msgstr[2] "cestami"
 
-#: ../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 "cesty"
+
+#: ../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
@@ -2121,265 +2595,27 @@
 msgstr[2] "relace"
 
-#: ../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 "Smazat {1} {0}"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97
-#, java-format
-msgid "Delete {0} {1}"
-msgstr "Smazat {0} {1}"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153
-msgid "Conflicting relation"
-msgstr "Konfliktní relace"
-
-#: ../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 ""
-"Výběr \"{0}\" je používán v relaci \"{1}\" s rolí {2}.\n"
-"Smazat z relace?"
-
-#: ../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 "Odstranit z relace"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
-#, java-format
-msgid ""
-"Selection \"{0}\" is used by relation \"{1}\".\n"
-"Delete from relation?"
-msgstr ""
-"Výběr \"{0}\" je používán v relaci \"{1}\".\n"
-"Smazat z relace?"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:366
-msgid "Split way segment"
-msgstr "Rozdělit segment cesty"
-
-#. 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 ""
-"Chystáte se smazat uzly mimo oblast, jež jste stáhli.<br>To může způsobit "
-"problémy, protože jiné objekty (které nevidíte) je mohou používat."
-"<br>Opravdu je chcete smazat?"
-
-#: ../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 "Přesunout"
-
-#: ../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 "Odstranit prvek relace"
-
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
-msgid "Rotate"
-msgstr "Otočit"
-
-#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88
-msgid "Sequence"
-msgstr "Sekvence"
-
-#: ../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 "Použít ?"
-
-#: ../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 ""
-"Byl změněn směr cesty. Mají se provést zásledující změny vlastností cesty a "
-"jejích bodů, z důvodů udržení konzistence dat?"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28
-msgid "Relation"
-msgstr "Vztah"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30
-msgid "Old role"
-msgstr "Stará role"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:32
-msgid "New role"
-msgstr "Nová role"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
-msgid "Old key"
-msgstr "Starý klíč"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
-msgid "Old value"
-msgstr "Stará hodnota"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
-msgid "New key"
-msgstr "Nový klíč"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
-msgid "New value"
-msgstr "Nová hodnota"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:40
-msgid "Apply selected changes"
-msgstr "Použít zvolené změny"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41
-msgid "Don't apply changes"
-msgstr "Neprovádět změny"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:83
-msgid "Please select which property changes you want to apply."
-msgstr "Prosím vyberte které změny vlastností chcete použít."
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:96
-msgid "Properties of "
-msgstr "Vlastnosti "
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:120
-msgid "Roles in relations referring to"
-msgstr "Role v relaci odkazující na"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:136
-msgid "Automatic tag correction"
-msgstr "Automatická korekce popisků"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:314
-#, java-format
-msgid "Malformed config file at lines {0}"
-msgstr "Poškozený konfigurační soubor na řádku {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:324
-#, java-format
-msgid "Cannot open preferences directory: {0}"
-msgstr "Nelze otevřít adresář s nastavením: {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 "Soubor s nastavením má chyby. Vytvářím zálohu starého do {0}."
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:79
-#, java-format
-msgid "Preferences stored on {0}"
-msgstr "Předvolby uloženy na {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:82
-#, java-format
-msgid "Could not upload preferences. Reason: {0}"
-msgstr "Nemohu nahrát předvolby. Důvod: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:93
-msgid "Could not load preferences from server."
-msgstr "Nemohu nahrát předvolby ze serveru."
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:34
-msgid "different"
-msgstr "různé"
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:262
-msgid "deleted"
-msgstr "smazáno"
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
-msgid "true"
-msgstr "pravda"
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
-msgid "false"
-msgstr "nepravda"
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20
-msgid "position"
-msgstr "pozice"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30
-msgid "Decimal Degrees"
-msgstr "Desetinné stupně"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
-msgid "Degrees Minutes Seconds"
-msgstr "Stupně minuty sekundy"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
-msgid "S"
-msgstr "J"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
-msgid "N"
-msgstr "S"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
-msgid "W"
-msgstr "Z"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
-msgid "E"
-msgstr "V"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:108
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:83
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:115
-msgid "incomplete"
-msgstr "nekompletní"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
-#, java-format
-msgid "Error: {0}"
-msgstr "Chyba: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
-#, java-format
-msgid "Warning: {0}"
-msgstr "Varování: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:101
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9
+msgid "relations"
+msgstr "vazby"
+
+#: ../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"
@@ -2394,5 +2630,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:122
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "railway"
 msgstr "železnice"
@@ -2415,4 +2651,62 @@
 msgstr[2] "{0} uzlů"
 
+#: ../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."
@@ -2560,5 +2854,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 "pozadí"
@@ -2648,8 +2942,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
@@ -2661,7 +2955,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
@@ -2767,10 +3061,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 "Jméno uživatele"
 
 #: ../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 "Heslo"
@@ -2866,22 +3160,22 @@
 msgstr "Nastavení {0} bylo odstraněno, protože se již nepoužívá."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:146
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148
 msgid "File"
 msgstr "Soubor"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150
 msgid "View"
 msgstr "Zobrazit"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:149
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151
 msgid "Tools"
 msgstr "Nástroje"
 
-#: ../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 "Předvolby"
 
-#: ../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
@@ -2894,21 +3188,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 "Drátový model"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:218
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221
 msgid "Toggle Wireframe view"
 msgstr "Přepnout drátový model"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:244
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:247
 msgid "Full Screen"
 msgstr "Celá obrazovka"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:246
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:249
 msgid "Toggle Full Screen view"
 msgstr "Přepnout zobrazení na celou obrazovku"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:286
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:289
 msgid "Audio"
 msgstr "Zvuk"
@@ -2980,6 +3274,6 @@
 msgstr "(žádný objekt)"
 
-#: ../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 "vrstva není v seznamu"
@@ -2989,9 +3283,9 @@
 msgstr "Kontaktuji OSM server..."
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:104
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:105
 msgid "Error while parsing"
 msgstr "Chyba při parsování"
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:107
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:108
 msgid "File not found"
 msgstr "Soubor nebyl nalezen"
@@ -3063,5 +3357,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 "Členové"
@@ -3257,5 +3551,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
@@ -3337,5 +3631,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 ""
@@ -3374,5 +3668,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 ""
 
@@ -3426,5 +3720,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 "Role"
@@ -3528,5 +3822,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
@@ -3840,5 +4134,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 "Relace"
@@ -3947,66 +4241,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 "Aplikovat změny"
 
-#: ../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 "Základní"
 
-#: ../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 "Obsazeno"
 
-#: ../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 "Tagy (prázdná hodnota vymaže tag)"
 
-#: ../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 "Posunout nahoru"
 
-#: ../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 "Přesunout zvolené prvky nahoru"
 
-#: ../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 "Přidat vybrané"
 
-#: ../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 "Přidat všechny zvolené objekty mezi prvky"
 
-#: ../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 "Odebrat označené"
 
-#: ../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 "Odebere všechny označené objekty z relace"
 
-#: ../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 "Posunout dolů"
 
-#: ../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 "Přesunout zvolenou vrstvu o řádek dolů."
 
-#: ../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 "Odstranit prvek v aktuálním řádku tabulky z relace"
 
-#: ../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 "Stáhnout prvky"
 
-#: ../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 "Stáhnout všechny nekompletní cesty a uzly v relaci"
@@ -4051,5 +4345,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
@@ -4070,9 +4364,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 "ano"
 
-#: ../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
@@ -4094,31 +4388,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 "ne"
 
-#: ../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 "Členové: {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 "Editor relací: {0}"
 
-#: ../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 "Vznikly konflikty během importu"
 
-#: ../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 "Chyba parsování odezvy serveru"
 
-#: ../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 "Nemohu se připojit na server."
+
+#: ../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
@@ -4182,17 +4479,17 @@
 msgstr "Zdroje a typy dat"
 
-#: ../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 "Uložit jako novou vrstvu"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:174
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:173
 msgid "Download Area"
 msgstr "Stáhnout plochu"
 
-#: ../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 "Stahovaná plocha je moc velká, server zřejmě odmítne váš požadavek"
 
-#: ../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 "Stahovaná plocha je v pořádku, velikost akceptována serverem"
@@ -4220,5 +4517,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 "Místa"
@@ -4265,21 +4562,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 "typ"
@@ -4319,14 +4616,4 @@
 msgid "Tile Numbers"
 msgstr "Čísla dlaždic"
-
-#: ../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 "Můžete použít kolečko myši nebo Ctrl+Šipky ke zvětšení či posunu"
-
-#. 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 "Přehledová mapa"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:98
@@ -4406,5 +4693,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)"
@@ -4520,14 +4807,14 @@
 msgstr "Wave Audiosoubory (*.wav)"
 
-#: ../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 "Audio značky z {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244
 msgid "Import images"
 msgstr "Importovat obrázky"
 
-#: ../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, "
@@ -4537,5 +4824,5 @@
 msgstr[2] "{0} cesty, "
 
-#: ../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, "
@@ -4545,5 +4832,5 @@
 msgstr[2] "{0} trasy, "
 
-#: ../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"
@@ -4553,28 +4840,28 @@
 msgstr[2] "{0} značek"
 
-#: ../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 "Jméno: {0}"
 
-#: ../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 "Popis: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347
 msgid "Timespan: "
 msgstr "Časové rozpětí: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354
 msgid "Length: "
 msgstr "Délka: "
 
-#: ../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 "Převést do datové vrstvy"
 
-#: ../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 ""
@@ -4585,11 +4872,11 @@
 "<br>Pokud chcete nahrát trasy, podívejte se tady:"
 
-#: ../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
@@ -4599,29 +4886,29 @@
 msgstr "Převedeno z: {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 "Stáhnout data z OSM podél této trasy"
 
-#: ../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 "Stáhnout vše v rozmezí:"
 
-#: ../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 "{0} metrů"
 
-#: ../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 "Maximální plocha na požadavek:"
 
-#: ../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 "{0} čtverečních km"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:822
 #, java-format
 msgid ""
@@ -4632,9 +4919,9 @@
 "pokračovat?</html>"
 
-#: ../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 "Není dostupná žádná GPX trasa pro kterou by šel asociovat zvuk."
 
-#: ../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 "
@@ -4642,5 +4929,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 "
@@ -4650,33 +4937,42 @@
 "byly vynechány."
 
-#: ../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 "mimo stažený areál"
 
-#: ../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 "{0} se skládá z:"
 
-#: ../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} smazáno.)"
 
-#: ../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 "Verze API: {0}"
 
-#: ../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"
@@ -4684,21 +4980,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"
@@ -4847,5 +5143,5 @@
 msgstr "Výchozí hodnota není známa ( ještě nebyla definována )"
 
-#: ../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
@@ -4854,5 +5150,5 @@
 msgstr "Zvolte řádek k editaci"
 
-#: ../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
@@ -4860,5 +5156,5 @@
 msgstr "Nová hodnota pro {0}"
 
-#: ../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
@@ -4868,5 +5164,5 @@
 msgstr "Zvolte řádek k vymazání"
 
-#: ../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 "Zadejte novou dvojici klíč/hodnota"
@@ -5743,106 +6039,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 "Název"
@@ -6314,6 +6610,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:36
-msgid "Login name (email) to the OSM account."
-msgstr "Přihlašovací jméno (email) k OSM účtu."
+msgid "Login name (e-mail) to the OSM account."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
@@ -6328,6 +6624,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
-msgid "OSM username (email)"
-msgstr "OSM uživatelské jméno (email)"
+msgid "OSM username (e-mail)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
@@ -6338,10 +6634,7 @@
 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 ""
-"<html>VAROVÁNÍ: Heslo je uloženo v textovém formátu v souboru s nastavením."
-"<br>Heslo je na server posíláno nezašifrované, zakódované v URL."
-"<br><b>Nepoužívejte stejné heslo, které používáte někde jinde.</b></html>"
 
 #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on
@@ -6636,6 +6929,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 "Kontaktuji OSM server..."
@@ -6646,7 +6940,7 @@
 msgstr "Stahuji body {0} až {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 "Stahuji OSM data..."
@@ -6711,15 +7005,14 @@
 msgstr "NMEA import selhal!"
 
-#: ../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 ""
@@ -6728,31 +7021,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 "Otevírám sadu změn..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:351
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298
 msgid "Closing changeset..."
 msgstr "Zavírám sadu změn..."
 
-#: ../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 "Připravuji..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:381
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:326
 msgid "Uploading..."
 msgstr "Nahrávám..."
@@ -6767,25 +7066,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 "Nesprávné heslo nebo uživatelské jméno"
 
-#: ../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 "Upozornění: heslo je posíláno nezašifrované."
 
-#: ../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 "Uložit uživatelské jméno a heslo (nezašifrované)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:89
 msgid "Enter Password"
 msgstr "Zadejte heslo"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
 msgid "Login"
 msgstr "Přihlásit se"
 
-#: ../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..."
@@ -6796,4 +7095,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."
@@ -6886,9 +7228,23 @@
 msgstr "Neplatné id uzlu"
 
-#: ../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 "Kontaktuji server..."
 
-#: ../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."
@@ -6897,17 +7253,9 @@
 "internetu."
 
-#: ../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 vrátil vnitřní chybu. Zkuste to za chvíli znovu nebo zkuste zmenšit "
-"oblast."
-
-#: ../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 ""
 
@@ -6923,5 +7271,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 "Stáhnout pluginy"
@@ -7112,9 +7460,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 "Stáhnout chybějící pluginy"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:128
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:119
 #, java-format
 msgid ""
@@ -7127,6 +7475,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
@@ -7149,35 +7497,35 @@
 msgstr "neznámý"
 
-#: ../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}: Verze {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 zahrnut v JOSM"
 
-#: ../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 "Chyba čtení souboru informací o pluginu: {0}"
 
-#: ../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 "Toto je až za koncem nahrávky"
 
-#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:329
+#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:340
 msgid "Error playing sound"
 msgstr "Chyba přehrávání zvuku"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
 msgid "Do nothing"
 msgstr "Nedělat nic"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
 msgid "Report Bug"
 msgstr "Nahlásit chybu"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:52
 msgid ""
 "An unexpected exception occurred.\n"
@@ -7191,18 +7539,18 @@
 "verzi JOSM, buďte tak laskavi a chybu nahlašte."
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55
 msgid "Unexpected Exception"
 msgstr "Neočekávaná výjimka"
 
-#: ../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 "Prosíme oznamte chybu na {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 "Popište (detailně) kroky, které vedly k chybě."
 
-#: ../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 "
@@ -7211,9 +7559,9 @@
 "Zkuste aktualizovat na nejnovější verzi tohoto pluginu před hlášením chyby."
 
-#: ../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 "Prosíme, připojte následující informace:"
 
-#: ../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 "(Text již byl zkopírován do schránky.)"
@@ -7297,5 +7645,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 "Popis"
@@ -7675,9 +8023,7 @@
 #: ../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 ""
-"Chyba nastala při pokusu o dosazení fotografií do GPX trasy. Můžete ručně "
-"upravit posuvníky aby byli fotografie dosazeny."
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:853
@@ -7709,5 +8055,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"
@@ -7730,5 +8075,5 @@
 msgstr "Cache soubor pro Lambertovu zónu 4 (.4)"
 
-#: ../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
@@ -7823,6 +8168,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/"
@@ -7904,6 +8249,6 @@
 msgstr "Přidat \"source=...\" k objektům?"
 
-#: ../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
@@ -7911,11 +8256,11 @@
 msgstr "Stahuji {0}"
 
-#: ../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 "Kontaktuji WMS server..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:157
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:158
 msgid "Create buildings"
 msgstr "Vytvořit budovy"
@@ -7932,13 +8277,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 "Extrahovat SVG ViewBox..."
 
-#: ../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 "Vytvořit hranice"
@@ -7959,5 +8304,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 "Stáhnout obrázek z WMS francouzského katastru"
 
@@ -8051,5 +8396,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
@@ -8057,59 +8402,28 @@
 msgstr "Prázdná vrstva"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:176
 #, java-format
 msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr "WMS vrstva ({0}), nahráno {1} dlaždic"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:183
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:178
 msgid "Is not vectorized."
 msgstr "Není vektorizovaný."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:179
 #, java-format
 msgid "Raster center: {0}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181
 msgid "Is vectorized."
 msgstr "Je vektorizovaný."
 
-#: ../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 "Uložit WMS vrstvu do souboru"
-
-#: ../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 "Nahrát WMS vrstvu ze souboru"
-
-#: ../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 "Nepodporovaná verze WMS souboru; nalezeno {0}, očekáváno {1}"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:325
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:335
-msgid "File Format Error"
-msgstr "Chyba formátu souboru"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:481
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:401
 #, java-format
 msgid ""
@@ -8120,15 +8434,14 @@
 "Vytvořte nový soubor."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:482
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402
 msgid "Cache Format Error"
 msgstr "Chyba formátu cache"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:497
-#, java-format
-msgid "Lambert zone {0} in cache  incompatible with current Lambert zone {1}"
-msgstr ""
-"Lambertova zóna {0} v cache nekompatibilní se současnou Lambertovou zónou {1}"
-
-#: ../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 "Chyba Lambertovy zóny v cache"
@@ -8223,11 +8536,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 "Importovat cestu z GPX vrstvy"
 
 #: ../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 "Zahodit existující cestu"
@@ -8237,5 +8550,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 "Nenalezena vrstva s GPX daty."
@@ -8526,4 +8839,8 @@
 msgid "Lakewalker trace"
 msgstr "Lakewalker trasování"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:10
+msgid "An unknown error has occurred"
+msgstr ""
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
@@ -8846,42 +9163,42 @@
 msgstr "LiveGPS"
 
-#: ../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 "Naměřené hodnoty"
 
-#: ../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 "Otevřít okno s měřením."
 
-#: ../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 "Reset"
 
-#: ../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 "Zrušit současné měření a smazat měřící cestu."
 
-#: ../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 "Délka cesty"
 
-#: ../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 "Délka výběru"
 
-#: ../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 "Plocha výběru"
 
-#: ../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 "Úhel"
 
-#: ../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 "Úhel mezi dvěmi zvolenými uzly"
 
-#: ../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 "Vrstva pro prováděná měření"
@@ -8940,6 +9257,6 @@
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
-msgid "Open the OpenStreetBugs window and activate the automatic download"
-msgstr "Otevře okno OpenStreetBugs a aktivuje automatické stahování"
+msgid "Opens the OpenStreetBugs window and activates the automatic download"
+msgstr ""
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:123
@@ -9016,5 +9333,5 @@
 msgstr "Osmarender"
 
-#: ../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 "
@@ -9024,9 +9341,9 @@
 "mapy v nastavení."
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:123
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:127
 msgid "osmarender options"
 msgstr "nastavení osmarenderu"
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:124
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:128
 msgid "Firefox executable"
 msgstr "Spustitelný soubor Firefoxu"
@@ -9461,5 +9778,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 "Jméno ulice"
@@ -9554,6 +9871,6 @@
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:195
-msgid "No intersections found. Nothing was changed."
-msgstr "Nenalezen průsečík. Nic nebylo změněno."
+msgid "No intersection found. Nothing was changed."
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:217
@@ -10430,19 +10747,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 "Nápověda pluginu WMS Plugin"
@@ -10501,5 +10817,5 @@
 msgstr "Upravit pozici zvolené WMS vrstvy"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113
 #, java-format
 msgid ""
@@ -10545,4 +10861,29 @@
 msgid "Alpha channel"
 msgstr "Alfa kanál"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
+msgid "Save WMS layer to file"
+msgstr "Uložit WMS vrstvu do souboru"
+
+#: ../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 "Nahrát WMS vrstvu ze souboru"
+
+#: ../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 "Nepodporovaná verze WMS souboru; nalezeno {0}, očekáváno {1}"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:335
+msgid "File Format Error"
+msgstr "Chyba formátu souboru"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:163
@@ -10637,4 +10978,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 ""
@@ -10649,5 +10995,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 ""
 
@@ -10949,5 +11295,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 "Číslo"
@@ -11449,5 +11795,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 "Šířka (metrů)"
@@ -11916,7 +12262,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 "Typ"
@@ -12532,10 +12878,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 "Operátor"
@@ -12747,7 +13093,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 "Nadmořská výška"
@@ -13679,5 +14025,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 "Poplatek"
@@ -13813,5 +14159,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 "Číslo nástupiště"
@@ -13819,5 +14165,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 "Označit jako plochu"
@@ -13869,11 +14215,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 "Přístřešek"
+
+#. item "Public Transport/Bus Stop" check "Shelter"
 #. </optional>
-#: build/trans_presets.java:1503
+#: build/trans_presets.java:1504
 msgid "Bus Platform"
 msgstr "Nástupiště autobusu"
 
 #. item
-#: build/trans_presets.java:1504
+#: build/trans_presets.java:1505
 msgid "Edit Bus Platform"
 msgstr "Upravit nástupiště autobusu"
@@ -13881,5 +14237,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1512
+#: build/trans_presets.java:1513
 msgid "Taxi"
 msgstr "Stanoviště taxi"
@@ -13887,5 +14243,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 "Upravit stanoviště taxi"
@@ -13893,5 +14249,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1519
+#: build/trans_presets.java:1520
 msgid "Airport"
 msgstr "Letiště"
@@ -13899,15 +14255,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 "Upravit letiště"
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1526
+#: build/trans_presets.java:1527
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1527
+#: build/trans_presets.java:1528
 msgid "ICAO"
 msgstr "ICAO"
@@ -13916,5 +14272,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1532
+#: build/trans_presets.java:1533
 msgid "Accomodation"
 msgstr "Ubytování"
@@ -13926,5 +14282,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 "Hotel"
@@ -13933,15 +14289,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 "Upravit hotel"
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1539
+#: build/trans_presets.java:1540
 msgid "Stars"
 msgstr "Počet hvězdiček"
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1541
+#: build/trans_presets.java:1542
 msgid "Motel"
 msgstr "Motel"
@@ -13949,20 +14305,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 "Upravit motel"
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1547
+#: build/trans_presets.java:1548
 msgid "Guest House"
 msgstr "Penzion"
 
 #. item
-#: build/trans_presets.java:1548
+#: build/trans_presets.java:1549
 msgid "Edit Guest House"
 msgstr "Upravit penzion"
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1552
+#: build/trans_presets.java:1553
 msgid "Chalet"
 msgstr "Horská chata"
@@ -13970,10 +14326,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 "Upravit horskou chatu"
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1558
+#: build/trans_presets.java:1559
 msgid "Hostel"
 msgstr "Hostel"
@@ -13981,30 +14337,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 "Upravit hostel"
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1564
+#: build/trans_presets.java:1565
 msgid "Alpine Hut"
 msgstr "Horská bouda"
 
 #. item
-#: build/trans_presets.java:1565
+#: build/trans_presets.java:1566
 msgid "Edit Alpine Hut"
 msgstr "Upravit vysokohorskou boudu"
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1570
+#: build/trans_presets.java:1571
 msgid "Caravan Site"
 msgstr "Autokemping (karavany)"
 
 #. item
-#: build/trans_presets.java:1571
+#: build/trans_presets.java:1572
 msgid "Edit Caravan Site"
 msgstr "Upravit autokemping (karavany)"
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1575
+#: build/trans_presets.java:1576
 msgid "Camping Site"
 msgstr "Tábořiště"
@@ -14012,10 +14368,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 "Upravit tábořiště"
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1582
+#: build/trans_presets.java:1583
 msgid "Food+Drinks"
 msgstr "Jídlo a pití"
@@ -14026,5 +14382,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 "Restaurace"
@@ -14032,5 +14388,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 "Upravit restauraci"
@@ -14038,5 +14394,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 "Kuchyně"
@@ -14044,61 +14400,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 "italská"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "chinese"
 msgstr "čínská"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "burger"
 msgstr "hamburger"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "greek"
 msgstr "řecká"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "german"
 msgstr "německá"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "indian"
 msgstr "indická"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "regional"
 msgstr "místní"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "turkish"
 msgstr "turecká"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "asian"
 msgstr "asijská"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "thai"
 msgstr "thajská"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "mexican"
 msgstr "mexická"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "japanese"
 msgstr "japonská"
 
-#: build/trans_presets.java:1590
+#: build/trans_presets.java:1591
 msgid "Fast Food"
 msgstr "Rychlé občersvení"
@@ -14106,9 +14462,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 "Upravit rychlé občerstvení"
 
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1598
 msgid "Cafe"
 msgstr "Kavárna"
@@ -14116,10 +14472,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 "Upravit kavárnu"
 
 #. item "Food+Drinks/Cafe" text "Name"
-#: build/trans_presets.java:1603
+#: build/trans_presets.java:1604
 msgid "Pub"
 msgstr "Hospoda"
@@ -14127,20 +14483,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 "Upravit hospodu"
 
 #. item "Food+Drinks/Pub" text "Name"
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1610
 msgid "Biergarten"
 msgstr "Hospoda-zahrádka"
 
 #. item
-#: build/trans_presets.java:1610
+#: build/trans_presets.java:1611
 msgid "Edit Biergarten"
 msgstr "Upravit hospoda-zahrádka"
 
 #. item "Food+Drinks/Biergarten" text "Name"
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1615
 msgid "Bar"
 msgstr "Bar"
@@ -14148,10 +14504,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 "Upravit bar"
 
 #. item "Food+Drinks/Bar" text "Name"
-#: build/trans_presets.java:1620
+#: build/trans_presets.java:1621
 msgid "Nightclub"
 msgstr "Noční klub"
@@ -14159,20 +14515,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 "Upravit noční klub"
 
 #. item "Food+Drinks/Nightclub" text "Name"
-#: build/trans_presets.java:1627
+#: build/trans_presets.java:1628
 msgid "Tourism"
 msgstr "Turistika"
 
 #. group "Tourism"
-#: build/trans_presets.java:1628
+#: build/trans_presets.java:1629
 msgid "Attraction"
 msgstr "Atrakce"
 
 #. item
-#: build/trans_presets.java:1629
+#: build/trans_presets.java:1630
 msgid "Edit Attraction"
 msgstr "Upravit atrakci"
@@ -14181,11 +14537,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 "Otevírací doba"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1634
+#: build/trans_presets.java:1635
 msgid "Museum"
 msgstr "Muzeum"
@@ -14193,10 +14549,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 "Upravit muzeum"
 
 #. item "Tourism/Museum" text "Name"
-#: build/trans_presets.java:1640
+#: build/trans_presets.java:1641
 msgid "Zoo"
 msgstr "Zoo"
@@ -14205,10 +14561,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 "Upravit zoo"
 
 #. item "Tourism/Zoo" text "Name"
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1648
 msgid "Viewpoint"
 msgstr "Vyhlídka"
@@ -14216,25 +14572,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 "Upravit vyhlídku"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1652
+#: build/trans_presets.java:1653
 msgid "Look-Out Tower"
 msgstr "Vyhlídková věž"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1654
+#: build/trans_presets.java:1655
 msgid "Theme Park"
 msgstr "Zábavní park"
 
 #. item
-#: build/trans_presets.java:1655
+#: build/trans_presets.java:1656
 msgid "Edit Theme Park"
 msgstr "Upravit zábavní park"
 
 #. item "Tourism/Theme Park" text "Name"
-#: build/trans_presets.java:1659
+#: build/trans_presets.java:1660
 msgid "Artwork"
 msgstr "Umělecké dílo"
@@ -14242,5 +14598,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 "Upravit umělecké dílo"
@@ -14248,5 +14604,5 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1667
 msgid "Information Office"
 msgstr "Turistické informační centrum"
@@ -14254,83 +14610,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 "Editovat turistické informační centrum"
 
+#. item "Tourism/Information Office" text "Opening Hours"
+#: build/trans_presets.java:1675
+msgid "Map"
+msgstr "Přehledová mapa"
+
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1679
 msgid "Map Type"
 msgstr "Typ mapy"
 
 #. item "Tourism/Map" combo "Map Type"
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1679
 msgid "map"
 msgstr "mapa"
 
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1679
 msgid "citymap"
 msgstr "plán města"
 
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1679
 msgid "hikingmap"
 msgstr "turistická mapa"
 
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1679
 msgid "bicyclemap"
 msgstr "cyklistická mapa"
 
 #. 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 "Bližší popis"
 
 #. item "Tourism/Map" text "Closer Description"
-#: build/trans_presets.java:1681
+#: build/trans_presets.java:1682
 msgid "Information Board"
 msgstr "Informační nástěnka"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1686
 msgid "Board Type"
 msgstr "Typ nástěnky"
 
 #. item "Tourism/Information Board" combo "Board Type"
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1686
 msgid "board"
 msgstr "obecná nástěnka"
 
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1686
 msgid "history"
 msgstr "informace o historii"
 
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1686
 msgid "nature"
 msgstr "informace o přírodě"
 
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1686
 msgid "wildlife"
 msgstr "informace o divokých zvířatech"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1688
+#: build/trans_presets.java:1689
 msgid "Guidepost (Hiking)"
 msgstr "Rozcestník (pěší)"
 
 #. item "Tourism/Guidepost (Hiking)" text "Elevation"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1696
 msgid "Other Information Points"
 msgstr "Jiný informační bod"
 
-#. 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 "Přístřešek"
-
-#. item
-#: build/trans_presets.java:1703
+#. item
+#: build/trans_presets.java:1704
 msgid "Edit Shelter"
 msgstr "Upravit přístřešek"
@@ -14338,25 +14691,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 "Ohniště"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1709
 msgid "Picnic Site"
 msgstr "Místo na piknik"
 
 #. item
-#: build/trans_presets.java:1709
+#: build/trans_presets.java:1710
 msgid "Edit Picnic Site"
 msgstr "Upravit místo na piknik"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1716
 msgid "Historic Places"
 msgstr "Historická místa"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1716
+#: build/trans_presets.java:1717
 msgid "Castle"
 msgstr "Zámek/Hrad"
@@ -14365,20 +14718,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 "Upravit zámek/hrad"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1724
 msgid "Ruins"
 msgstr "Zřícenina"
 
 #. item
-#: build/trans_presets.java:1724
+#: build/trans_presets.java:1725
 msgid "Edit Ruins"
 msgstr "Upravit zříceninu"
 
 #. item "Historic Places/Ruins" text "Name"
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1729
 msgid "Archaeological Site"
 msgstr "Archeologické naleziště"
@@ -14387,10 +14740,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 "Upravit archeologické naleziště"
 
 #. item "Historic Places/Archaeological Site" text "Name"
-#: build/trans_presets.java:1735
+#: build/trans_presets.java:1736
 msgid "Battlefield"
 msgstr "Bojiště"
@@ -14398,5 +14751,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 "Upravit bojiště"
@@ -14404,15 +14757,15 @@
 #. item "Historic Places/Battlefield" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1743
 msgid "Monument"
 msgstr "Monument"
 
 #. item
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1744
 msgid "Edit Monument"
 msgstr "Upravit monument"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1748
 msgid "Memorial"
 msgstr "Památník"
@@ -14420,45 +14773,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 "Upravit památník"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1753
+#: build/trans_presets.java:1754
 msgid "Wayside Cross"
 msgstr "Kříž"
 
 #. item
-#: build/trans_presets.java:1754
+#: build/trans_presets.java:1755
 msgid "Edit Wayside Cross"
 msgstr "Upravit kříž"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1758
+#: build/trans_presets.java:1759
 msgid "Wayside Shrine"
 msgstr "Boží muka"
 
 #. item
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1760
 msgid "Edit Wayside Shrine"
 msgstr "Upravit boží muka"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1765
 msgid "Leisure"
 msgstr "Volný čas"
 
 #. group "Leisure"
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1766
 msgid "Water Park"
 msgstr "Akvapark"
 
 #. item
-#: build/trans_presets.java:1766
+#: build/trans_presets.java:1767
 msgid "Edit Water Park"
 msgstr "Upravit akvapark"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1770
+#: build/trans_presets.java:1771
 msgid "Playground"
 msgstr "Hřiště"
@@ -14466,15 +14819,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 "Upravit hřiště"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1776
+#: build/trans_presets.java:1777
 msgid "Fishing"
 msgstr "Rybaření"
 
 #. item
-#: build/trans_presets.java:1777
+#: build/trans_presets.java:1778
 msgid "Edit Fishing"
 msgstr "Upravit rybaření"
@@ -14482,15 +14835,15 @@
 #. item "Leisure/Fishing" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1783
+#: build/trans_presets.java:1784
 msgid "Sport Facilities"
 msgstr "Sportovní zařízení"
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1784
+#: build/trans_presets.java:1785
 msgid "Stadium"
 msgstr "Stadion"
 
 #. item
-#: build/trans_presets.java:1785
+#: build/trans_presets.java:1786
 msgid "Edit Stadium"
 msgstr "Upravit stadion"
@@ -14504,6 +14857,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 "vyberte sport:"
@@ -14879,6 +15232,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
@@ -14911,227 +15264,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 "kombinovaný"
 
-#: 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 "lukostřelba"
 
-#: 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 "atletika"
 
-#: 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 "australský fotbal"
 
-#: 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 "baseball"
 
-#: 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 "basketbal"
 
-#: 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 "Hry s koulemi (např. pétanque)"
 
-#: 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 "bowls"
 
-#: 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 "kanoistika"
 
-#: 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 "Horolezení"
 
-#: 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 "kriket"
 
-#: 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 "ohražené místo pro tréning kriketu"
 
-#: 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 "kroket"
 
-#: 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 "cyklistika"
 
-#: 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 "závody psů"
 
-#: 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 "krasojízda"
 
-#: 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 "fotbal"
 
-#: 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 "golf"
 
-#: 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 "gymnastika"
 
-#: 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 "hokej"
 
-#: 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 "dostihy"
 
-#: 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 "motoristické sporty"
 
-#: 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 "pelota (míčová hra)"
 
-#: 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 "pálkové (raketové) sporty"
 
-#: 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 "ragby"
 
-#: 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 "střelba"
 
-#: 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 "skateboard"
 
-#: 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 "bruslení"
 
-#: 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 "lyžování"
 
-#: 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 "fotbal"
 
-#: 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 "plavání"
 
-#: 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 "stolní tenis"
 
-#: 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 "tenis"
 
-#: build/trans_presets.java:1793
+#: build/trans_presets.java:1794
 msgid "Sports Centre"
 msgstr "Sportovní centrum"
 
 #. item
-#: build/trans_presets.java:1794
+#: build/trans_presets.java:1795
 msgid "Edit Sports Centre"
 msgstr "Upravit sportovní centrum"
 
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1803
 msgid "Pitch"
 msgstr "Hřiště"
 
 #. item
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1804
 msgid "Edit Pitch"
 msgstr "Upravit hřiště"
 
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1812
 msgid "Racetrack"
 msgstr "Závodní trať"
 
 #. item
-#: build/trans_presets.java:1812
+#: build/trans_presets.java:1813
 msgid "Edit Racetrack"
 msgstr "Upravit závodní trať"
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1821
 msgid "Golf Course"
 msgstr "Golfové hřiště"
 
 #. item
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1822
 msgid "Edit Golf Course"
 msgstr "Upravit golfové hřiště"
 
 #. item "Sport Facilities/Golf Course" text "Name"
-#: build/trans_presets.java:1825
+#: build/trans_presets.java:1826
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item
-#: build/trans_presets.java:1826
+#: build/trans_presets.java:1827
 msgid "Edit Miniature Golf"
 msgstr "Upravit minigolf"
 
 #. item "Sport Facilities/Miniature Golf" text "Name"
-#: build/trans_presets.java:1831
+#: build/trans_presets.java:1832
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1833
 msgid "Multi"
 msgstr "Kombinováné"
 
 #. item
-#: build/trans_presets.java:1833
+#: build/trans_presets.java:1834
 msgid "Edit Multi"
 msgstr "Upravit kombinované"
@@ -15170,191 +15523,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 "hřiště"
 
-#: 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 "sportovní centrum"
 
-#: 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 "stadion"
 
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1839
 msgid "10pin"
 msgstr "Bowling"
 
 #. item
-#: build/trans_presets.java:1839
+#: build/trans_presets.java:1840
 msgid "Edit 10pin"
 msgstr "Upravit bowling"
 
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1845
 msgid "Athletics"
 msgstr "Atletika"
 
 #. item
-#: build/trans_presets.java:1845
+#: build/trans_presets.java:1846
 msgid "Edit Athletics"
 msgstr "Upravit atletiku"
 
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1851
 msgid "Archery"
 msgstr "Lukostřelba"
 
 #. item
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:1852
 msgid "Edit Archery"
 msgstr "Upravit lukostřelbu"
 
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:1857
 msgid "Climbing"
 msgstr "Horolezení"
 
 #. item
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:1858
 msgid "Edit Climbing"
 msgstr "Upravit horolezení"
 
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1863
 msgid "Canoeing"
 msgstr "Kanoistika"
 
 #. item
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:1864
 msgid "Edit Canoeing"
 msgstr "Upravit kanoistiku"
 
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:1869
 msgid "Cycling"
 msgstr "Cyklistika"
 
 #. item
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1870
 msgid "Edit Cycling"
 msgstr "Upravit cyklistiku"
 
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1875
 msgid "Dog Racing"
 msgstr "Závody psů"
 
 #. item
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1876
 msgid "Edit Dog Racing"
 msgstr "Upravit závody psů"
 
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1881
 msgid "Equestrian"
 msgstr "Krasojízda"
 
 #. item
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:1882
 msgid "Edit Equestrian"
 msgstr "Upravit krasojízdu"
 
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1887
 msgid "Horse Racing"
 msgstr "Dostihy"
 
 #. item
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1888
 msgid "Edit Horse Racing"
 msgstr "Upravit dostihy"
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:1893
 msgid "Gymnastics"
 msgstr "Gymnastika"
 
 #. item
-#: build/trans_presets.java:1893
+#: build/trans_presets.java:1894
 msgid "Edit Gymnastics"
 msgstr "Upravit gymnastiku"
 
-#: build/trans_presets.java:1898
+#: build/trans_presets.java:1899
 msgid "Motor Sports"
 msgstr "Motorové sporty"
 
 #. item
-#: build/trans_presets.java:1899
+#: build/trans_presets.java:1900
 msgid "Edit Motor Sports"
 msgstr "Upravit motorové sporty"
 
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:1905
 msgid "Skating"
 msgstr "Bruslení"
 
 #. item
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:1906
 msgid "Edit Skating"
 msgstr "Upravit bruslení"
 
-#: build/trans_presets.java:1910
+#: build/trans_presets.java:1911
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:1912
 msgid "Edit Skateboard"
 msgstr "Upravit Skateboard"
 
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:1917
 msgid "Swimming"
 msgstr "Plavání"
 
 #. item
-#: build/trans_presets.java:1917
+#: build/trans_presets.java:1918
 msgid "Edit Swimming"
 msgstr "Upravit plavání"
 
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:1923
 msgid "Skiing"
 msgstr "Lyžování"
@@ -15362,56 +15715,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 "Upravit lyžování"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1928
 msgid "Piste type"
 msgstr "Typ sjezdovky"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1928
 msgid "downhill"
 msgstr "Sjezdovka"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1928
 msgid "nordic"
 msgstr "Běžecká trať"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1928
 msgid "snow_park"
 msgstr "snow park"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:1929
 msgid "Difficulty"
 msgstr "Obtížnost"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:1929
 msgid "novice"
 msgstr "pro začátečníky (zelená)"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:1929
 msgid "easy"
 msgstr "jednoduchá (modrá)"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:1929
 msgid "intermediate"
 msgstr "pro středně pokročilé (červená)"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:1929
 msgid "advanced"
 msgstr "pro zkušené (černá)"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:1929
 msgid "expert"
 msgstr "pro experty (oranžová)"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:1929
 msgid "freeride"
 msgstr "volný terén - freeride (žlutá)"
 
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1932
 msgid "Shooting"
 msgstr "Střelba"
@@ -15419,178 +15772,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 "Upravit střelbu"
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1940
 msgid "Sport (Ball)"
 msgstr "Sport (míčové hry)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1941
 msgid "Soccer"
 msgstr "Fotbal"
 
 #. item
-#: build/trans_presets.java:1941
+#: build/trans_presets.java:1942
 msgid "Edit Soccer"
 msgstr "Upravit fotbal"
 
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:1947
 msgid "Football"
 msgstr "Fotbal"
 
 #. item
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:1948
 msgid "Edit Football"
 msgstr "Upravit fotbal"
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1953
 msgid "Australian Football"
 msgstr "Australský fotbal"
 
 #. item
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:1954
 msgid "Edit Australian Football"
 msgstr "Upravit australský fotbal"
 
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:1959
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:1960
 msgid "Edit Baseball"
 msgstr "Upravit baseball"
 
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:1965
 msgid "Basketball"
 msgstr "Basketbal"
 
 #. item
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:1966
 msgid "Edit Basketball"
 msgstr "Upravit basketbal"
 
-#: 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 "Upravit Golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1975
 msgid "golf_course"
 msgstr "golfové hřiště"
 
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:1977
 msgid "Boule"
 msgstr "Hry s koulemi (např. pétanque)"
 
 #. item
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:1978
 msgid "Edit Boule"
 msgstr "Upravit hry s koulemi (např. pétanque)"
 
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:1983
 msgid "Bowls"
 msgstr "Bowls"
 
 #. item
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1984
 msgid "Edit Bowls"
 msgstr "Upravit Bowls"
 
-#: 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 "Upravit kriket"
 
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:1995
 msgid "Cricket Nets"
 msgstr "Ohražené místo pro tréning kriketu"
 
 #. item
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:1996
 msgid "Edit Cricket Nets"
 msgstr "Upravit ohražené místo pro tréning kriketu"
 
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:2001
 msgid "Croquet"
 msgstr "Kroket"
 
 #. item
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:2002
 msgid "Edit Croquet"
 msgstr "Upravit kroket"
 
-#: build/trans_presets.java:2006
+#: build/trans_presets.java:2007
 msgid "Hockey"
 msgstr "Hokej"
 
 #. item
-#: build/trans_presets.java:2007
+#: build/trans_presets.java:2008
 msgid "Edit Hockey"
 msgstr "Upravit hokej"
 
-#: build/trans_presets.java:2012
+#: build/trans_presets.java:2013
 msgid "Pelota"
 msgstr "Pelota (míčová hra)"
 
 #. item
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2014
 msgid "Edit Pelota"
 msgstr "Upravit pelotu (míčová hra)"
 
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2019
 msgid "Racquet"
 msgstr "Pálkové (raketové) sporty"
 
 #. item
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2020
 msgid "Edit Racquet"
 msgstr "Upravit pálkové (raketové) sporty"
 
-#: build/trans_presets.java:2024
+#: build/trans_presets.java:2025
 msgid "Rugby"
 msgstr "Ragby"
 
 #. item
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2026
 msgid "Edit Rugby"
 msgstr "Upravit ragby"
 
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:2031
 msgid "Table Tennis"
 msgstr "Stolní tenis (ping-pong)"
 
 #. item
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2032
 msgid "Edit Table Tennis"
 msgstr "Upravit stolní tenis (ping-pong)"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2037
 msgid "Tennis"
 msgstr "Tenis"
 
 #. item
-#: build/trans_presets.java:2037
+#: build/trans_presets.java:2038
 msgid "Edit Tennis"
 msgstr "Upravit tenis"
 
 #. <separator/>
-#: build/trans_presets.java:2044
+#: build/trans_presets.java:2045
 msgid "Buildings"
 msgstr "Budovy"
 
 #. group "Buildings"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2046
 msgid "Building"
 msgstr "Budova"
@@ -15598,5 +15951,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2049
 msgid "Public Building"
 msgstr "Veřejná budova"
@@ -15604,10 +15957,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 "Upravit veřejnou budovu"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2055
 msgid "Town hall"
 msgstr "Radnice"
@@ -15615,10 +15968,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 "Upravit radnici"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2061
 msgid "Embassy"
 msgstr "Ambasáda"
@@ -15626,10 +15979,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 "Upravit ambasádu"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2066
+#: build/trans_presets.java:2067
 msgid "Courthouse"
 msgstr "Soud"
@@ -15638,10 +15991,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 "Upravit soud"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2074
 msgid "Prison"
 msgstr "Vězení"
@@ -15650,10 +16003,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 "Upravit vězení"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2080
+#: build/trans_presets.java:2081
 msgid "Police"
 msgstr "Policie"
@@ -15663,10 +16016,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 "Upravit policii"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2089
 msgid "Fire Station"
 msgstr "Hasičská stanice"
@@ -15675,10 +16028,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 "Upravit hasičskou stanici"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2096
 msgid "Post Office"
 msgstr "Pošta"
@@ -15686,5 +16039,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 "Upravit poštu"
@@ -15692,15 +16045,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2103
 msgid "Kindergarten"
 msgstr "Mateřská škola"
 
 #. item
-#: build/trans_presets.java:2103
+#: build/trans_presets.java:2104
 msgid "Edit Kindergarten"
 msgstr "Upravit mateřskou školu"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2108
 msgid "School"
 msgstr "Škola"
@@ -15708,10 +16061,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 "Upravit školu"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2114
 msgid "University"
 msgstr "Vysoká škola"
@@ -15719,10 +16072,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 "Upravit vysokou školu"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2120
 msgid "College"
 msgstr "Střední škola"
@@ -15730,5 +16083,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 "Upravit střední školu"
@@ -15736,5 +16089,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2126
+#: build/trans_presets.java:2127
 msgid "Cinema"
 msgstr "Kino"
@@ -15743,10 +16096,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 "Upravit kino"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2133
+#: build/trans_presets.java:2134
 msgid "Library"
 msgstr "Knihovna"
@@ -15755,10 +16108,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 "Upravit knihovnu"
 
 #. item "Buildings/Library" text "Name"
-#: build/trans_presets.java:2140
+#: build/trans_presets.java:2141
 msgid "Arts Centre"
 msgstr "Komunitní umělecké centrum"
@@ -15766,10 +16119,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 "Upravit komunitní umělecké centrum"
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2146
+#: build/trans_presets.java:2147
 msgid "Theatre"
 msgstr "Divadlo"
@@ -15778,10 +16131,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 "Upravit divadlo"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2154
 msgid "Place of Worship"
 msgstr "Chrám(kostel, synagoga, mešita)"
@@ -15791,5 +16144,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 "Upravit chrám"
@@ -15798,6 +16151,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 "Náboženství"
@@ -15806,66 +16159,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 "bahá'í"
 
-#: 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 "budhistické"
 
-#: 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 "křesťanské"
 
-#: 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 "hindské"
 
-#: 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 "džinistické"
 
-#: 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 "židovské"
 
-#: 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 "muslimské"
 
-#: 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 ""
 
-#: 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 "spiritualistické"
 
-#: 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 "taoistické"
 
-#: 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 "Unitářské"
 
-#: 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 "zoroastristické"
 
-#: 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 "Vyznání"
@@ -15874,81 +16227,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 "anglikánské"
 
-#: 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 "baptistické"
 
-#: 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 "katolické"
 
-#: 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 "evangelické"
 
-#: 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 "svědkové Jehovovi"
 
-#: 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 "luteránské"
 
-#: 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 "metodistické"
 
-#: 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 "mormonské"
 
-#: 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 "pravoslavné"
 
-#: 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 "pentekostalistické"
 
-#: 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 "presbyteriánské"
 
-#: 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 "protestantské"
 
-#: 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 "kvakerské"
 
-#: 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 "ší'itské"
 
-#: 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 "sunnitské"
 
 #. <separator/>
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2165
 msgid "Addresses"
 msgstr "Adresy"
@@ -15957,5 +16310,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 "Upravit informace o adrese"
@@ -15963,5 +16316,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2169
+#: build/trans_presets.java:2170
 msgid "House number"
 msgstr "Číslo domu"
@@ -15969,20 +16322,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2172
 msgid "House name"
 msgstr "Jméno domu"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2174
 msgid "City name"
 msgstr "Jméno města"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2174
+#: build/trans_presets.java:2175
 msgid "Post code"
 msgstr "Poštovní směrovací číslo"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2176
 msgid "Country code"
 msgstr "Kód země"
@@ -15990,5 +16343,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2179
 msgid "Address Interpolation"
 msgstr "Interpolace adres"
@@ -15997,5 +16350,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 "Upravit interpolaci adres"
@@ -16003,71 +16356,71 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2184
 msgid "Numbering scheme"
 msgstr "Schéma číslování"
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2184
 msgid "odd"
 msgstr "liché"
 
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2184
 msgid "even"
 msgstr "sudé"
 
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2184
 msgid "all"
 msgstr "všechny"
 
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2184
 msgid "alphabetic"
 msgstr "abecední"
 
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2187
 msgid "Man Made"
 msgstr "Umělé konstrukce"
 
 #. group "Man Made"
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2188
 msgid "Works"
 msgstr "Továrna"
 
 #. item
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2189
 msgid "Edit Works"
 msgstr "Upravit továrnu"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2193
 msgid "Tower"
 msgstr "Věž"
 
 #. item
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2194
 msgid "Edit Tower"
 msgstr "Upravit věž"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2198
 msgid "Water Tower"
 msgstr "Vodojem"
 
 #. item
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2199
 msgid "Edit Water Tower"
 msgstr "Upravit vodojem"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2203
 msgid "Gasometer"
 msgstr "Plynojem"
 
 #. item
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2204
 msgid "Edit Gasometer"
 msgstr "Upravit plynojem"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2207
+#: build/trans_presets.java:2208
 msgid "Lighthouse"
 msgstr "Maják"
@@ -16075,10 +16428,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 "Upravit maják"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2214
 msgid "Windmill"
 msgstr "Větrný mlýn"
@@ -16086,10 +16439,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 "Upravit větrný mlýn"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2220
 msgid "Pipeline"
 msgstr "Potrubí"
@@ -16097,10 +16450,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 "Upravit potrubí"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2225
+#: build/trans_presets.java:2226
 msgid "Wastewater Plant"
 msgstr "Čistička odpadních vod"
@@ -16110,10 +16463,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 "Upravit čističku odpadních vod"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2233
+#: build/trans_presets.java:2234
 msgid "Crane"
 msgstr "Jeřáb"
@@ -16121,10 +16474,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 "Upravit jeřáb"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2239
+#: build/trans_presets.java:2240
 msgid "Beacon"
 msgstr "Vodní bój"
@@ -16132,10 +16485,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 "Editovat vodní bój"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2245
+#: build/trans_presets.java:2246
 msgid "Survey Point"
 msgstr "Triangulační bod"
@@ -16143,10 +16496,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 "Upravit triangulační bod"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2252
 msgid "Surveillance"
 msgstr "Sledovací kamera"
@@ -16154,5 +16507,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 "Upravit sledovací kameru"
@@ -16160,5 +16513,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2258
+#: build/trans_presets.java:2259
 msgid "Power Generator"
 msgstr "Elektrárna"
@@ -16168,39 +16521,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 "Upravit elektrárnu"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "wind"
 msgstr "větrná"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "hydro"
 msgstr "vodní"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "fossil"
 msgstr "fosilní paliva"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "nuclear"
 msgstr "jaderná"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "coal"
 msgstr "uhelná"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "photovoltaic"
 msgstr "sluneční"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "gas"
 msgstr "plynová"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2268
 msgid "Power Station"
 msgstr "Rozvodna"
@@ -16209,10 +16562,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 "Upravit rozvodnu"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2274
+#: build/trans_presets.java:2275
 msgid "Power Sub Station"
 msgstr "Trafostanice"
@@ -16221,5 +16574,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 "Upravit trafostanici"
@@ -16227,10 +16580,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 "Číslo vedení"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2282
+#: build/trans_presets.java:2283
 msgid "Power Tower"
 msgstr "Stožár elektrického vedení"
@@ -16241,5 +16594,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 "Upravit stožár elektrického vedení"
@@ -16247,5 +16600,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 "Dráty elektrického vedení"
@@ -16254,25 +16607,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 "Upravit dráty elektrického vedení"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2298
 msgid "Voltage"
 msgstr "Napětí"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2299
 msgid "Amount of Wires"
 msgstr "Počet drátů tvořících vodič"
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2301
+#: build/trans_presets.java:2302
 msgid "Amenities"
 msgstr "Občanská vybavenost"
 
 #. group "Amenities"
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2303
 msgid "Toilets"
 msgstr "Záchody"
@@ -16280,20 +16633,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 "Číslo záchodu"
 
 #. 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 "Poznámka"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2312
 msgid "Post Box"
 msgstr "Poštovní schránka"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2317
 msgid "Telephone"
 msgstr "Telefon"
@@ -16302,5 +16655,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 "Upravit telefon"
@@ -16308,5 +16661,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 "Mince"
@@ -16314,5 +16667,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 "Bankovky"
@@ -16320,5 +16673,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 "Elektronické peněženky nebo kreditní karty."
@@ -16326,5 +16679,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 "Debetní karty"
@@ -16332,15 +16685,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 "Kreditní karty"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2328
 msgid "Telephone cards"
 msgstr "Telefonní karty"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2330
 msgid "Recycling"
 msgstr "Recyklační stanoviště"
@@ -16349,5 +16702,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 "Upravit recyklační stanoviště"
@@ -16355,35 +16708,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 "Baterie"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2336
 msgid "Cans"
 msgstr "Plechovky"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2337
 msgid "Clothes"
 msgstr "Oblečení"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2338
 msgid "Glass"
 msgstr "Sklo"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2339
 msgid "Paper"
 msgstr "Papír"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2340
 msgid "Scrap Metal"
 msgstr "Kovový šrot"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2342
 msgid "Bench"
 msgstr "Lavička"
@@ -16392,20 +16745,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 "Posed"
 
 #. item
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2347
 msgid "Edit Hunting Stand"
 msgstr "Upravit posed"
 
 #. item "Amenities/Hunting Stand" check "Shelter"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2350
 msgid "Hide"
 msgstr "Úkryt"
 
 #. item "Amenities/Hunting Stand" check "Hide"
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2351
 msgid "Lock"
 msgstr "Uzamknutelný"
@@ -16413,22 +16766,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 "Výška"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2351
+#: build/trans_presets.java:2352
 msgid "low"
 msgstr "nízká"
 
-#: build/trans_presets.java:2351
+#: build/trans_presets.java:2352
 msgid "half"
 msgstr "střední"
 
-#: build/trans_presets.java:2351
+#: build/trans_presets.java:2352
 msgid "full"
 msgstr "plná"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2354
 msgid "Fountain"
 msgstr "Fontána"
@@ -16437,10 +16790,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 "Upravit fontánu"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2361
 msgid "Drinking Water"
 msgstr "Pitná voda"
@@ -16449,10 +16802,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 "Upravit pitnou vodu"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2367
+#: build/trans_presets.java:2368
 msgid "Baby Hatch"
 msgstr "Babybox"
@@ -16460,25 +16813,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 "Upravit babybox"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2375
+#: build/trans_presets.java:2376
 msgid "Shops"
 msgstr "Obchody"
 
 #. 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 "Upravit supermarket"
 
 #. item "Shops/Supermarket" text "Name"
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:2382
 msgid "Convenience Store"
 msgstr "Samoobsluha, smíšenka, večerka"
@@ -16486,10 +16839,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 "Upravit večerku"
 
 #. item "Shops/Convenience Store" text "Name"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2388
 msgid "Kiosk"
 msgstr "Kiosek"
@@ -16497,10 +16850,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 "Upravit kiosek"
 
 #. item "Shops/Kiosk" text "Name"
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2394
 msgid "Vending machine"
 msgstr "Prodejní automat"
@@ -16508,5 +16861,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 "Upravit prodejní automat"
@@ -16514,88 +16867,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 "Prodávané produkty"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "public_transport_tickets"
 msgstr "lístky na městskou hromadnou dopravu"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "public_transport_plans"
 msgstr "plány městské hromadné dopravy"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "parking_tickets"
 msgstr "parkovací lístky"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "food"
 msgstr "jídlo"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "drinks"
 msgstr "pití"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "sweets"
 msgstr "sladkosti"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "cigarettes"
 msgstr "cigarety"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "photos"
 msgstr "fotografie"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "animal_food"
 msgstr "krmivo pro zvířata"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "news_papers"
 msgstr "noviny"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "toys"
 msgstr "hračky"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "stamps"
 msgstr "známky"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "SIM-cards"
 msgstr "SIM-karty"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "telephone_vouchers"
 msgstr "telefonní karty"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "vouchers"
 msgstr "poukazy"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "condoms"
 msgstr "kondomy"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "tampons"
 msgstr "tampóny"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "excrement_bags"
 msgstr "sáčky na výkaly"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2407
 msgid "Account or loyalty cards"
 msgstr "Zůstatkové nebo věrnostní karty"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2408
+#: build/trans_presets.java:2409
 msgid "Butcher"
 msgstr "Řeznictví"
@@ -16603,10 +16956,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 "Upravit řeznictví"
 
 #. item "Shops/Butcher" text "Name"
-#: build/trans_presets.java:2414
+#: build/trans_presets.java:2415
 msgid "Baker"
 msgstr "Pekařství"
@@ -16614,10 +16967,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 "Upravit pekařství"
 
 #. item "Shops/Baker" text "Name"
-#: build/trans_presets.java:2420
+#: build/trans_presets.java:2421
 msgid "Florist"
 msgstr "Květinářství"
@@ -16625,20 +16978,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 "Upravit květinářství"
 
 #. item "Shops/Florist" text "Name"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2427
 msgid "Organic"
 msgstr "Obchod se zdravou výživou"
 
 #. item
-#: build/trans_presets.java:2427
+#: build/trans_presets.java:2428
 msgid "Edit Organic Shop"
 msgstr "Upravit obchod se zdravou výživou"
 
 #. item "Shops/Organic" text "Name"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2432
 msgid "Alcohol"
 msgstr "Alkohol"
@@ -16646,60 +16999,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 "Upravit obchod s alkoholem"
 
 #. item "Shops/Alcohol" text "Name"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2438
 msgid "Beverages"
 msgstr "Nápoje"
 
 #. item
-#: build/trans_presets.java:2438
+#: build/trans_presets.java:2439
 msgid "Edit Beverages Shop"
 msgstr "Upravit obchod s nápoji"
 
 #. item "Shops/Beverages" text "Name"
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:2443
 msgid "Computer"
 msgstr "Počítače"
 
 #. item
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2444
 msgid "Edit Computer Shop"
 msgstr "Upravit obchod s počítači"
 
 #. item "Shops/Computer" text "Name"
-#: build/trans_presets.java:2447
+#: build/trans_presets.java:2448
 msgid "Electronics"
 msgstr "Elektronika"
 
 #. item
-#: build/trans_presets.java:2448
+#: build/trans_presets.java:2449
 msgid "Edit Electronics Shop"
 msgstr "Upravit obchod s elektronikou"
 
 #. item "Shops/Electronics" text "Name"
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2453
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2454
 msgid "Edit Hifi Shop"
 msgstr "Upravit obchod s hifi"
 
 #. item "Shops/Hifi" text "Name"
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2458
 msgid "Furniture"
 msgstr "Nábytek"
 
 #. item
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2459
 msgid "Edit Furniture Shop"
 msgstr "Upravit obchod s nábytkem"
 
 #. item "Shops/Furniture" text "Name"
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2463
 msgid "Garden Centre"
 msgstr "Zahradnické centrum"
@@ -16707,10 +17060,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 "Upravit zahradnické centrum"
 
 #. item "Shops/Garden Centre" text "Name"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2469
 msgid "Hardware"
 msgstr "Železářství"
@@ -16718,10 +17071,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 "Upravit železářství"
 
 #. item "Shops/Hardware" text "Name"
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2475
 msgid "Do-it-yourself-store"
 msgstr "Zboží pro kutily"
@@ -16729,60 +17082,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 "Upravit obchod se zbožím pro kutily"
 
 #. item "Shops/Do-it-yourself-store" text "Name"
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2481
 msgid "Stationery"
 msgstr "Papírnictví"
 
 #. item
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2482
 msgid "Edit Stationery Shop"
 msgstr "Upravit papírnictví"
 
 #. item "Shops/Stationery" text "Name"
-#: build/trans_presets.java:2485
+#: build/trans_presets.java:2486
 msgid "Hairdresser"
 msgstr "Kadeřnictví"
 
 #. item
-#: build/trans_presets.java:2486
+#: build/trans_presets.java:2487
 msgid "Edit Hairdresser"
 msgstr "Upravit Kadeřnictví"
 
 #. item "Shops/Hairdresser" text "Name"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2491
 msgid "Shoes"
 msgstr "Obuv"
 
 #. item
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2492
 msgid "Edit Shoe Shop"
 msgstr "Upravit obchod s obuví"
 
 #. item "Shops/Shoes" text "Name"
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2496
 msgid "Toys"
 msgstr "Hračky"
 
 #. item
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2497
 msgid "Edit Toy Shop"
 msgstr "Upravit obchod s hračkami"
 
 #. item "Shops/Toys" text "Name"
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2501
 msgid "Video"
 msgstr "Videopůjčovna/prodejna"
 
 #. item
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2502
 msgid "Edit Video Shop"
 msgstr "Upravit videopůjčovnu/prodejnu"
 
 #. item "Shops/Video" text "Name"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2506
 msgid "Dry Cleaning"
 msgstr "Čistírna"
@@ -16790,10 +17143,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 "Upravit čistírnu"
 
 #. item "Shops/Dry Cleaning" text "Name"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2512
 msgid "Laundry"
 msgstr "Prádelna"
@@ -16801,10 +17154,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 "Upravit prádelnu"
 
 #. item "Shops/Laundry" text "Name"
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2518
 msgid "Outdoor"
 msgstr "Vybavení do přírody"
@@ -16812,35 +17165,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 "Obchod s vybavením do přírody"
 
 #. item "Shops/Outdoor" text "Name"
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2524
 msgid "Sports"
 msgstr "Sportovní potřeby"
 
 #. item
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2525
 msgid "Edit Sports Shop"
 msgstr "Upravit obchod se sportovními pořebami"
 
 #. item "Shops/Sports" text "Name"
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2529
 msgid "Optician"
 msgstr "Oční optik"
 
 #. item
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2530
 msgid "Edit Optician"
 msgstr "Upravit oční optiku"
 
 #. item "Shops/Optician" text "Name"
-#: build/trans_presets.java:2535
+#: build/trans_presets.java:2536
 msgid "Cash"
 msgstr "Finance"
 
 #. group "Cash"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2537
 msgid "Bank"
 msgstr "Banka"
@@ -16848,5 +17201,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 "Upravit banku"
@@ -16854,10 +17207,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 "Bankomat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2544
 msgid "Money Exchange"
 msgstr "Směnárna"
@@ -16865,5 +17218,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 "Upravit směnárnu"
@@ -16871,15 +17224,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 "Upravit bankomat"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2557
 msgid "Health"
 msgstr "Zdraví"
 
 #. group "Health"
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2558
 msgid "Doctors"
 msgstr "Středisko"
@@ -16887,20 +17240,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 "Upravit středisko"
 
 #. item "Health/Doctors" text "Name"
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2564
 msgid "Dentist"
 msgstr "Zubař"
 
 #. item
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2565
 msgid "Edit Dentist"
 msgstr "Upravit zubařskou ordinaci"
 
 #. item "Health/Dentist" text "Name"
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2569
 msgid "Pharmacy"
 msgstr "Lékárna"
@@ -16908,5 +17261,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 "Upravit lékárnu"
@@ -16914,10 +17267,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 "Vydává léky na předpis"
 
 #. item "Health/Pharmacy" text "Name"
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2576
 msgid "Hospital"
 msgstr "Nemocnice"
@@ -16925,10 +17278,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 "Upravit nemocnici"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2582
 msgid "Emergency Access Point"
 msgstr "Místo pro kontaktování záchranářů"
@@ -16937,5 +17290,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 "Upravit místo pro kontaktování záchranářů"
@@ -16944,20 +17297,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2588
 msgid "Point Number"
 msgstr "Číslo místa"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2589
 msgid "Point Name"
 msgstr "Jméno místa"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2591
 msgid "Phone Number"
 msgstr "Telefonní číslo"
 
 #. 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 "(Použijte mezinárodní zápis, např. +420123456789)"
@@ -16965,5 +17318,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 "Veterinář"
@@ -16972,25 +17325,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 "Upravit veterinární ordinaci"
 
 #. 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 "Upravit kontinent"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2611
 msgid "Country"
 msgstr "Stát"
 
 #. item
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2612
 msgid "Edit Country"
 msgstr "Upravit stát"
@@ -16998,30 +17351,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 "Země"
 
 #. item
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2618
 msgid "Edit State"
 msgstr "Upravit zemi"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2622
+#: build/trans_presets.java:2623
 msgid "Region"
 msgstr "Kraj"
 
 #. item
-#: build/trans_presets.java:2623
+#: build/trans_presets.java:2624
 msgid "Edit Region"
 msgstr "Upravit kraj"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2628
+#: build/trans_presets.java:2629
 msgid "County"
 msgstr "Okres"
 
 #. item
-#: build/trans_presets.java:2629
+#: build/trans_presets.java:2630
 msgid "Edit County"
 msgstr "Upravit okres"
@@ -17029,15 +17382,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2635
+#: build/trans_presets.java:2636
 msgid "City"
 msgstr "Velkoměsto"
 
 #. item
-#: build/trans_presets.java:2636
+#: build/trans_presets.java:2637
 msgid "Edit City"
 msgstr "Upravit velkoměsto"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2641
+#: build/trans_presets.java:2642
 msgid "Town"
 msgstr "Město"
@@ -17045,10 +17398,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 "Upravit město"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2649
 msgid "Suburb"
 msgstr "Městský obvod, nebo městská část"
@@ -17056,25 +17409,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 "Upravit městský obvod, nebo městská část"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2656
 msgid "Village"
 msgstr "Obec"
 
 #. item
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2657
 msgid "Edit Village"
 msgstr "Upravit obci"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2662
 msgid "Hamlet"
 msgstr "Samota"
 
 #. item
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2663
 msgid "Edit Hamlet"
 msgstr "Upravit samotu"
@@ -17082,5 +17435,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2669
 msgid "Locality"
 msgstr "Místní název"
@@ -17088,10 +17441,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 "Editovat místní název"
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2676
 msgid "Island"
 msgstr "Ostrov"
@@ -17099,5 +17452,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 "Upravit ostrov"
@@ -17105,5 +17458,5 @@
 #. item "Places/Island" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2683
+#: build/trans_presets.java:2684
 msgid "Cave Entrance"
 msgstr "Vstup do jeskyně"
@@ -17111,10 +17464,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 "Upravit vstup do jeskyně"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2690
 msgid "Peak"
 msgstr "Vrchol"
@@ -17122,10 +17475,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 "Upravit vrchol"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2697
 msgid "Glacier"
 msgstr "Ledovec"
@@ -17133,10 +17486,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 "Upravit ledovec"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2703
+#: build/trans_presets.java:2704
 msgid "Volcano"
 msgstr "Sopka"
@@ -17144,70 +17497,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 "Upravit sopku"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2711
+#: build/trans_presets.java:2712
 msgid "Boundaries"
 msgstr "Hranice"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2713
 msgid "National"
 msgstr "Národní"
 
 #. item
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2714
 msgid "Edit National Boundary"
 msgstr "Upravit národní hranici"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2718
+#: build/trans_presets.java:2719
 msgid "Administrative"
 msgstr "Administrativní"
 
 #. item
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2720
 msgid "Edit Administrative Boundary"
 msgstr "Upravit administrativní hranici"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2724
+#: build/trans_presets.java:2725
 msgid "Civil"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2725
+#: build/trans_presets.java:2726
 msgid "Edit Civil Boundary"
 msgstr ""
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2730
+#: build/trans_presets.java:2731
 msgid "Political"
 msgstr "Volební obvod"
 
 #. item
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:2732
 msgid "Edit Political Boundary"
 msgstr "Upravit volební obvod"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2736
+#: build/trans_presets.java:2737
 msgid "National park"
 msgstr "Národní park"
 
 #. item
-#: build/trans_presets.java:2737
+#: build/trans_presets.java:2738
 msgid "Edit National Park Boundary"
 msgstr "Upravit hranice národního parku"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2744
 msgid "Land use"
 msgstr "Využití krajiny"
 
 #. group "Land use"
-#: build/trans_presets.java:2744
+#: build/trans_presets.java:2745
 msgid "Tree"
 msgstr "Strom"
@@ -17216,15 +17569,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 "Upravit strom"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2753
 msgid "Botanical Name"
 msgstr "Botanické jméno"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2755
 msgid "Wood"
 msgstr "Prales"
@@ -17233,5 +17586,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 "Editovat Prales"
@@ -17239,17 +17592,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 "jehličnatý"
 
-#: build/trans_presets.java:2760 build/trans_presets.java:2769
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
 msgid "deciduous"
 msgstr "listnatý"
 
-#: build/trans_presets.java:2760 build/trans_presets.java:2769
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
 msgid "mixed"
 msgstr "smíšený"
 
-#: build/trans_presets.java:2762
+#: build/trans_presets.java:2763
 msgid "Forest"
 msgstr "Les"
@@ -17258,14 +17611,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 "Upravit lesní plochu"
 
-#: build/trans_presets.java:2771
+#: build/trans_presets.java:2772
 msgid "Nature Reserve"
 msgstr "Přírodní rezervace"
 
 #. item
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2773
 msgid "Edit Nature Reserve"
 msgstr "Upravit přírodní rezervaci"
@@ -17273,25 +17626,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2777
+#: build/trans_presets.java:2778
 msgid "Scree"
 msgstr "Suťoviště"
 
 #. item
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:2779
 msgid "Edit Scree"
 msgstr "Upravit suťoviště"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2783
 msgid "Scrub"
 msgstr "Podrost"
 
 #. item
-#: build/trans_presets.java:2783
+#: build/trans_presets.java:2784
 msgid "Edit Scrub"
 msgstr "Upravit podrost"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2788
 msgid "Fell"
 msgstr "Travnatá pahorkatina"
@@ -17299,10 +17652,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 "Upravit travnatou pahorkatinu"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2794
 msgid "Heath"
 msgstr "Vřesoviště"
@@ -17310,5 +17663,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 "Upravit vřesoviště"
@@ -17316,5 +17669,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2801
 msgid "Farmyard"
 msgstr "Farma"
@@ -17323,45 +17676,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 "Upravit farmu"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2808
+#: build/trans_presets.java:2809
 msgid "Farmland"
 msgstr "Zemědělská půda"
 
 #. item
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2810
 msgid "Edit Farmland Landuse"
 msgstr "Upravit zemědělskou půdu"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2814
+#: build/trans_presets.java:2815
 msgid "Meadow"
 msgstr "Louka"
 
 #. item
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2816
 msgid "Edit Meadow Landuse"
 msgstr "Upravit louku"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2820
+#: build/trans_presets.java:2821
 msgid "Vineyard"
 msgstr "Vinice"
 
 #. item
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2822
 msgid "Edit Vineyard Landuse"
 msgstr "Upravit vinici"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2826
+#: build/trans_presets.java:2827
 msgid "Allotments"
 msgstr "Zahrádkářská kolonie"
 
 #. item
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:2828
 msgid "Edit Allotments Landuse"
 msgstr "Upravit zahrádkářskou kolonii"
@@ -17369,25 +17722,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2833
+#: build/trans_presets.java:2834
 msgid "Garden"
 msgstr "Zahrada"
 
 #. item
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2835
 msgid "Edit Garden"
 msgstr "Upravit zahradu"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2838
+#: build/trans_presets.java:2839
 msgid "Grass"
 msgstr "Tráva"
 
 #. item
-#: build/trans_presets.java:2839
+#: build/trans_presets.java:2840
 msgid "Edit Grass Landuse"
 msgstr "Upravit travnatou plochu"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2845
 msgid "Village Green"
 msgstr "Zelená plocha"
@@ -17395,10 +17748,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 "Upravit zelenou plochu"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:2852
 msgid "Common"
 msgstr "veřejná zeleň (mimo parky)"
@@ -17406,20 +17759,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 "Upravit veřejnou zeleň"
 
 #. 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 "Upravit park"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2863
 msgid "Recreation Ground"
 msgstr "Rekreační plocha"
@@ -17427,5 +17780,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 "Upravit rekreační plochu"
@@ -17433,15 +17786,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2871
 msgid "Residential area"
 msgstr "Obytná plocha"
 
 #. item
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2872
 msgid "Edit Residential Landuse"
 msgstr "Upravit obytnou plochu"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2877
 msgid "Graveyard"
 msgstr "Malý hřbitov"
@@ -17449,9 +17802,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 "Upravit malý hřbitov"
 
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:2885
 msgid "Cemetery"
 msgstr "Hřbitov"
@@ -17459,39 +17812,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 "Upravit hřbitov"
 
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2894
 msgid "Retail"
 msgstr "Obchody"
 
 #. item
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2895
 msgid "Edit Retail Landuse"
 msgstr "Upravit plochu s obchody"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2900
 msgid "Commercial"
 msgstr "Kanceláře"
 
 #. item
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2901
 msgid "Edit Commercial Landuse"
 msgstr "Upravit kancelářskou plochu"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2906
 msgid "Industrial"
 msgstr "Průmysl"
 
 #. item
-#: build/trans_presets.java:2906
+#: build/trans_presets.java:2907
 msgid "Edit Industrial Landuse"
 msgstr "Upravit průmyslovou plochu"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2912
 msgid "Railway land"
 msgstr "Železniční plocha"
@@ -17499,15 +17852,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 "Upravit železniční plochu"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:2919
 msgid "Military"
 msgstr "Vojenský prostor"
 
 #. item
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2920
 msgid "Edit Military Landuse"
 msgstr "Upravit vojenský prostor"
@@ -17515,55 +17868,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2925
+#: build/trans_presets.java:2926
 msgid "Construction area"
 msgstr "Probíhající výstavba"
 
 #. item
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2927
 msgid "Edit Construction Landuse"
 msgstr "Upravit výstavbu"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2932
 msgid "Brownfield"
 msgstr "Stará zátěž, městské ruiny (Brownfield)"
 
 #. item
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:2933
 msgid "Edit Brownfield Landuse"
 msgstr "Upravit starou zátěž (Brownfield)"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2937
+#: build/trans_presets.java:2938
 msgid "Greenfield"
 msgstr "Zastavitelné území (Greenfield)"
 
 #. item
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:2939
 msgid "Edit Greenfield Landuse"
 msgstr "Upravit zastavitelné území (Greenfield)"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:2944
 msgid "Landfill"
 msgstr "skládka odpadu"
 
 #. item
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:2945
 msgid "Edit Landfill Landuse"
 msgstr "Upravit skládku odpadu"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2950
 msgid "Quarry"
 msgstr "Lom"
 
 #. item
-#: build/trans_presets.java:2950
+#: build/trans_presets.java:2951
 msgid "Edit Quarry Landuse"
 msgstr "Upravit lom"
 
 #. group "Relations"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2960
 msgid "Multipolygon"
 msgstr "Multipolygon"
@@ -17573,5 +17926,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 "Upravit multipolygon"
@@ -17580,10 +17933,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:2970
 msgid "outer segment"
 msgstr "vnější část"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:2970
+#: build/trans_presets.java:2971
 msgid "inner segment"
 msgstr "vnitřní část"
@@ -17591,5 +17944,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:2974
 msgid "Turn restriction"
 msgstr "Zákaz odbočení"
@@ -17598,5 +17951,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 "Upravit zákaz odbočení"
@@ -17604,34 +17957,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 "Omezení"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_left_turn"
 msgstr "zákaz odbočení vlevo"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_right_turn"
 msgstr "zákaz odbočení vpravo"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_straight_on"
 msgstr "zákaz jízdy rovně"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_u_turn"
 msgstr "zákaz otáčení"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "only_right_turn"
 msgstr "pouze odbočení vpravo"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "only_left_turn"
 msgstr "pouze odbočení vlevo"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "only_straight_on"
 msgstr "pouze jízda rovně"
@@ -17640,15 +17993,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2983
+#: build/trans_presets.java:2984
 msgid "from way"
 msgstr "z cesty"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2985
 msgid "via node or way"
 msgstr "přes uzel nebo cestu"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2986
 msgid "to way"
 msgstr "na cestu"
@@ -17656,5 +18009,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:2988
+#: build/trans_presets.java:2989
 msgid "Route"
 msgstr "Trasa"
@@ -17663,5 +18016,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 "Upravit trasu"
@@ -17669,5 +18022,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 "Typ trasy"
@@ -17739,5 +18092,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
@@ -17746,17 +18099,17 @@
 msgstr "bicykl"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "bus"
 msgstr "autobus"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "road"
 msgstr "silnice"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "ferry"
 msgstr "trajekt"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "ski"
 msgstr "lyžařská"
@@ -17809,5 +18162,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
@@ -17816,13 +18169,13 @@
 msgstr "pěší"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "hiking"
 msgstr "turistická"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "tram"
 msgstr "tramvajová"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "detour"
 msgstr "objízdná"
@@ -17836,10 +18189,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 "metro"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:2997
 msgid "Symbol description"
 msgstr ""
@@ -17847,26 +18200,26 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:2999
+#: build/trans_presets.java:3000
 msgid "Network"
 msgstr "Síť"
 
 #. item "Relations/Route" combo "State"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "proposed"
 msgstr "navrhovaná"
 
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "alternate"
 msgstr "alternativní"
 
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "temporary"
 msgstr "dočasná"
 
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "connection"
 msgstr "spojení"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3003
 msgid "Color (hex)"
 msgstr "Barva (hex)"
@@ -17875,30 +18228,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:3006
 msgid "route segment"
 msgstr "segment trasy"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3007
 msgid "forward segment"
 msgstr "dopředný segment"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3008
 msgid "backward segment"
 msgstr "zpětný segment"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3009
 msgid "halt point"
 msgstr "zastávka"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3010
 msgid "forward halt point"
 msgstr "dopředná zastávka"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3011
 msgid "backward halt point"
 msgstr "zpětná zastávka"
@@ -22013,7 +22366,19 @@
 msgstr ""
 
+#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
+#~ msgstr "Můžete použít kolečko myši nebo Ctrl+Šipky ke zvětšení či posunu"
+
 #~ msgid "Uploading data"
 #~ msgstr "Nahrávám data"
 
+#~ msgid "Email"
+#~ msgstr "E-mail"
+
+#~ msgid "Login name (email) to the OSM account."
+#~ msgstr "Přihlašovací jméno (email) k OSM účtu."
+
+#~ msgid "OSM username (email)"
+#~ msgstr "OSM uživatelské jméno (email)"
+
 #~ msgid "Unknown host"
 #~ msgstr "Neznámé jméno počítače"
@@ -22021,4 +22386,11 @@
 #~ msgid "Add either site-josm.xml or Wiki Pages."
 #~ msgstr "Zadejte buď site-josm.xml nebo stránky Wiki."
+
+#~ msgid ""
+#~ "Server returned internal error. Try a reduced area or retry after waiting "
+#~ "some time."
+#~ msgstr ""
+#~ "Server vrátil vnitřní chybu. Zkuste to za chvíli znovu nebo zkuste "
+#~ "zmenšit oblast."
 
 #~ msgid "Commit comment"
@@ -22064,4 +22436,14 @@
 #~ msgid "Really mark this issue as ''done''?"
 #~ msgstr "Opravdu označit tento problém jako \"hotový\"?"
+
+#~ 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 URL.<br><b>Do not use a valuable Password.</b></html>"
+#~ msgstr ""
+#~ "<html>VAROVÁNÍ: Heslo je uloženo v textovém formátu v souboru s "
+#~ "nastavením.<br>Heslo je na server posíláno nezašifrované, zakódované v "
+#~ "URL.<br><b>Nepoužívejte stejné heslo, které používáte někde jinde.</b></"
+#~ "html>"
 
 #~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS"
@@ -22088,4 +22470,7 @@
 #~ msgstr "viadukt"
 
+#~ msgid "Open the OpenStreetBugs window and activate the automatic download"
+#~ msgstr "Otevře okno OpenStreetBugs a aktivuje automatické stahování"
+
 #~ msgid "The projection could not be read from preferences. Using EPSG:4326"
 #~ msgstr "Nelze načíst projekci z uloženého nastavení. Používám EPSG:4326"
@@ -22094,7 +22479,32 @@
 #~ msgstr "Sportovní potřeby"
 
+#~ msgid ""
+#~ "Lambert zone {0} in cache  incompatible with current Lambert zone {1}"
+#~ msgstr ""
+#~ "Lambertova zóna {0} v cache nekompatibilní se současnou Lambertovou zónou "
+#~ "{1}"
+
 #~ msgid "Delete and Download"
 #~ msgstr "Smazat a stáhnout"
 
+#~ msgid "No intersections found. Nothing was changed."
+#~ msgstr "Nenalezen průsečík. Nic nebylo změněno."
+
+#~ msgid ""
+#~ "This action will require {0} individual download requests. Do you wish to "
+#~ "continue?"
+#~ msgstr ""
+#~ "Tato akce bude potřebovat {0} jednotlivých stažení dat. Chcete pokračovat?"
+
+#~ msgid ""
+#~ "An error occured while trying to match the photos to the GPX track. You "
+#~ "can adjust the sliders to manually match the photos."
+#~ msgstr ""
+#~ "Chyba nastala při pokusu o dosazení fotografií do GPX trasy. Můžete ručně "
+#~ "upravit posuvníky aby byli fotografie dosazeny."
+
+#~ msgid "The following errors occured during mass download:"
+#~ msgstr "Následující chyby nastaly při hromadném stahování:"
+
 #~ msgid "Edit Drawbridge"
 #~ msgstr "Upravit padací most"
@@ -22102,4 +22512,15 @@
 #~ msgid "Edit Portcullis"
 #~ msgstr "Upravit zkratky"
+
+#~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">english</A>."
+#~ msgstr ""
+#~ "Stránka s nápovědou chybí. Udělej jí v <A HREF=\"{0}\">angličtině</A>."
+
+#~ msgid ""
+#~ "Helppage missing. Create it in <A HREF=\"{0}\">english</A> or <A HREF="
+#~ "\"{1}\">your language</A>."
+#~ msgstr ""
+#~ "Stránka s nápovědou chybí. Udělej jí v <A HREF=\"{0}\">angličtině</A> "
+#~ "nebo  <A HREF=\"{1}\">ve tvém jazyce</A>."
 
 #~ msgid ""
Index: applications/editors/josm/i18n/po/da.po
===================================================================
--- applications/editors/josm/i18n/po/da.po	(revision 16008)
+++ applications/editors/josm/i18n/po/da.po	(revision 16009)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-14 16:51+0200\n"
-"PO-Revision-Date: 2009-06-09 18:18+0000\n"
-"Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
+"POT-Creation-Date: 2009-06-19 21:52+0200\n"
+"PO-Revision-Date: 2009-06-19 19:26+0000\n"
+"Last-Translator: Peter Brodersen <Unknown>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-06-14 14:46+0000\n"
+"X-Launchpad-Export-Date: 2009-06-19 19:34+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -27,12 +27,13 @@
 #: ../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 "Hjælp"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:261
-msgid "The projection could not be read from preferences. Using Mercartor"
-msgstr ""
+msgid "The projection could not be read from preferences. Using Mercator"
+msgstr ""
+"Projiceringen kunne ikke indlæses fra indstillingerne. Benytter Mercator."
 
 #: ../core/src/org/openstreetmap/josm/Main.java:349
@@ -70,6 +71,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 +89,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 +139,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"
@@ -535,5 +538,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}"
@@ -605,5 +608,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:92
-msgid "Email"
+msgid "E-Mail"
 msgstr "E-mail"
 
@@ -642,12 +645,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
@@ -674,5 +679,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
@@ -705,15 +710,15 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:207
 #, java-format
-msgid "Helppage missing. Create it in <A HREF=\"{0}\">english</A>."
-msgstr "Hjælpesiden mangler. Opret den på <a href=\"{0}\"engelsk</a>."
+msgid "Help page missing. Create it in <A HREF=\"{0}\">english</A>."
+msgstr "Hjælpesiden mangler. Opret den på <a href=\"{0}\">engelsk</a>"
 
 #: ../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 ""
-"Hjælpesiden mangler. Opret den på <a href=\"{0}\"engelsk</a>. eller i <a "
-"href=\"{1}\">dit eget sprog</a>."
+"Hjælpesiden mangler. Opret den på <a href=\"{0}\">engelsk</a> eller <a href="
+"\"{1}\">dit sprog</a>."
 
 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:26
@@ -795,13 +800,13 @@
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:70
 msgid "Mirror"
-msgstr ""
+msgstr "Afspejl"
 
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 msgid "Mirror selected nodes and ways."
-msgstr ""
+msgstr "Afspejl de valgte punkter og veje"
 
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53
 msgid "Please select at least one node or way."
-msgstr ""
+msgstr "Vælg mindst ét punkt eller vej."
 
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36
@@ -1031,5 +1036,5 @@
 #, java-format
 msgid "File {0} exists. Overwrite?"
-msgstr ""
+msgstr "Filen {0} eksisterer allerede. Overskriv?"
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
@@ -1084,5 +1089,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112
 msgid "Save Layer"
-msgstr ""
+msgstr "Gem lag"
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:122
@@ -1141,13 +1146,13 @@
 msgstr "Hjælp: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:99
 msgid "Status Report"
 msgstr "Statusrapport"
 
-#: ../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 "Kopier til udklipsholder og luk"
 
-#: ../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
@@ -1340,16 +1345,14 @@
 msgstr "Fravælg alt (Escape)"
 
-#: ../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 "Opdater data"
 
-#: ../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 "Opdaterer det nuværende datalag fra serveren (genhenter data)"
 
-#: ../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?"
@@ -1357,88 +1360,258 @@
 "Intet data til opdatering. Har du allerede åbnet eller downloadet et datalag?"
 
-#: ../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 ""
-"Denne handling kræver {0} individuelle download-anmodninger. Vil du "
-"fortsætte?"
-
-#: ../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 "Send til OSM..."
 
-#: ../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 "Send alle ændringer til OSM-serveren."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:96
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:94
 msgid "Objects to add:"
 msgstr "Tilføjede objekter:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102
 msgid "Objects to modify:"
 msgstr "Ændrede objekter:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:110
 msgid "Objects to delete:"
 msgstr "Slettede objekter:"
 
-#: ../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 "Angiv en kort kommentar for de ændringer, du uploader:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:126
 msgid "Upload these changes?"
 msgstr "Send disse ændringer?"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:130
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
 msgid "Upload Changes"
 msgstr "Send ændringer"
 
-#: ../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 "Intet at sende. Skab først noget data."
 
-#: ../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 "Der er uløste konflikter. Du skal løse disse først."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:182
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:180
 msgid "No changes to upload."
 msgstr "Ingen ændringer at sende."
 
-#: ../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 +1716,51 @@
 msgstr "Rå GPS-data"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:44
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:46
 msgid "Downloading data"
 msgstr "Henter data"
 
-#: ../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 "Intet data importeret."
 
-#: ../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 "Datalag {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 "OpenStreetMap-data"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:37
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:45
 msgid "Data Layer"
 msgstr "Datalag"
 
-#: ../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 "Henter {0} af {1} ({2} tilbage)"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:88
-msgid "The following errors occured during mass download:"
-msgstr "Følgende fejl opstod under den samlede download:"
-
-#: ../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 "Fejl ved download"
+
+#: ../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
@@ -1626,34 +1813,34 @@
 msgstr "Kan ikke tilføje et punkt uden for verdenen."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:495
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:493
 msgid "Add node"
 msgstr "Tilføj 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 "Tilføj punkt inde i vej"
 
-#: ../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 "Forbind eksisterende vej til punkt"
 
-#: ../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 "Tilføj et nyt punkt til en eksisterende vej"
 
-#: ../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 "Tilføj punkt ind i vej og forbind"
 
-#: ../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 "Opret nyt punkt."
 
-#: ../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 "Vælg punkt under markøren."
 
-#: ../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."
@@ -1662,14 +1849,14 @@
 msgstr[1] "Indsæt nyt punkt i {0} veje."
 
-#: ../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 "Start ny vej fra seneste punkt."
 
-#: ../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 "Fortsæt vej fra seneste punkt."
 
-#: ../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 "Afslut tegning."
@@ -1985,26 +2172,32 @@
 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 "Hent valgte"
 
-#: ../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 "Kontakt {0}..."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:45
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:46
 msgid "Downloading..."
 msgstr "Henter..."
 
-#: ../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 "Kunne ikke læse fra URL: \"{0}\""
 
-#: ../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 "Fortolkningsfejl i URL: \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:74
+msgid "Error while communicating with server."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67
@@ -2065,13 +2258,85 @@
 msgstr "Løs {0} konflikter i {1} objekter"
 
-#: ../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 "Slet {1} {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97
+#, java-format
+msgid "Delete {0} {1}"
+msgstr "Slet {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153
+msgid "Conflicting relation"
+msgstr "Modstridende relation"
+
+#: ../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 ""
+"Markeringen \"{0}\" bruges af relationen \"{1}\" med rollen {2}.\n"
+"Slet fra relation?"
+
+#: ../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 "Slet fra relation"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
+#, java-format
+msgid ""
+"Selection \"{0}\" is used by relation \"{1}\".\n"
+"Delete from relation?"
+msgstr ""
+"Markeringen \"{0}\" bruges af relationen \"{1}\".\n"
+"Slet fra relation?"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:366
+msgid "Split way segment"
+msgstr "Opdel vejstykke"
+
+#. 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 ""
+"Du er i gang med at slette punkter uden for området.du har downloadet."
+"<br>Dette kan skabe problemer, fordi andre objekter (som du ikke kan se) "
+"måske bruger dem.<br>Vil du virkelig slette?"
+
+#: ../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 "Flyt"
+
 #: ../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"
@@ -2080,10 +2345,218 @@
 msgstr[1] "noder"
 
-#: ../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 "Roter"
+
+#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88
+msgid "Sequence"
+msgstr "Sekvens"
+
+#: ../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 "Udfør?"
+
+#: ../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 "Relation"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30
+msgid "Old role"
+msgstr "Gammel rolle"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:32
+msgid "New role"
+msgstr "Ny rolle"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
+msgid "Old key"
+msgstr "Gammel nøgle"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
+msgid "Old value"
+msgstr "Gammel værdi"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
+msgid "New key"
+msgstr "Ny nøgle"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
+msgid "New value"
+msgstr "Ny værdi"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:40
+msgid "Apply selected changes"
+msgstr "Udfør valgte ændringer"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41
+msgid "Don't apply changes"
+msgstr "Undlad at udføre ændringer"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:83
+msgid "Please select which property changes you want to apply."
+msgstr "Vælg hvilke ændringer af egenskaber som du vil gennemføre."
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:96
+msgid "Properties of "
+msgstr "Egenskaber for "
+
+#: ../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 "Automatisk tag-rettelse"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:314
+#, java-format
+msgid "Malformed config file at lines {0}"
+msgstr "Fejl i konfigurationsfilen ved linjerne {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:324
+#, java-format
+msgid "Cannot open preferences directory: {0}"
+msgstr "Kan ikke åbne mappen for indstillinger: {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 ""
+"Indstillings-filen rummede fejl. Opretter en backup af den gamle fil til {0}."
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:79
+#, java-format
+msgid "Preferences stored on {0}"
+msgstr "Indstillinger er gemt på {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:82
+#, java-format
+msgid "Could not upload preferences. Reason: {0}"
+msgstr "Kunne ikke sende indstillinger. Årsag: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:93
+msgid "Could not load preferences from server."
+msgstr "Kunne ikke hente indstillinger fra serveren."
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:34
+msgid "different"
+msgstr "anderledes"
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:262
+msgid "deleted"
+msgstr "slettet"
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
+msgid "true"
+msgstr "sand"
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
+msgid "false"
+msgstr "falsk"
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20
+msgid "position"
+msgstr "position"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30
+msgid "Decimal Degrees"
+msgstr "decimalgrader"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
+msgid "Degrees Minutes Seconds"
+msgstr "Grader minutter sekunder"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+msgid "S"
+msgstr "S"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+msgid "N"
+msgstr "N"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+msgid "W"
+msgstr "V"
+
+#: ../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 "ufuldstændig"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
+#, java-format
+msgid "Error: {0}"
+msgstr "Fejl: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
+#, java-format
+msgid "Warning: {0}"
+msgstr "Advarsel: {0}"
+
+#: ../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"
@@ -2092,8 +2565,10 @@
 msgstr[1] "veje"
 
-#: ../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
@@ -2104,264 +2579,27 @@
 msgstr[1] "relationer"
 
-#: ../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 "Slet {1} {0}"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97
-#, java-format
-msgid "Delete {0} {1}"
-msgstr "Slet {0} {1}"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153
-msgid "Conflicting relation"
-msgstr "Modstridende relation"
-
-#: ../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 ""
-"Markeringen \"{0}\" bruges af relationen \"{1}\" med rollen {2}.\n"
-"Slet fra relation?"
-
-#: ../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 "Slet fra relation"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
-#, java-format
-msgid ""
-"Selection \"{0}\" is used by relation \"{1}\".\n"
-"Delete from relation?"
-msgstr ""
-"Markeringen \"{0}\" bruges af relationen \"{1}\".\n"
-"Slet fra relation?"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:366
-msgid "Split way segment"
-msgstr "Opdel vejstykke"
-
-#. 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 ""
-"Du er i gang med at slette punkter uden for området.du har downloadet."
-"<br>Dette kan skabe problemer, fordi andre objekter (som du ikke kan se) "
-"måske bruger dem.<br>Vil du virkelig slette?"
-
-#: ../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 "Flyt"
-
-#: ../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 "Roter"
-
-#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88
-msgid "Sequence"
-msgstr "Sekvens"
-
-#: ../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 "Udfør?"
-
-#: ../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 "Relation"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30
-msgid "Old role"
-msgstr "Gammel rolle"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:32
-msgid "New role"
-msgstr "Ny rolle"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
-msgid "Old key"
-msgstr "Gammel nøgle"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
-msgid "Old value"
-msgstr "Gammel værdi"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
-msgid "New key"
-msgstr "Ny nøgle"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
-msgid "New value"
-msgstr "Ny værdi"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:40
-msgid "Apply selected changes"
-msgstr "Udfør valgte ændringer"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41
-msgid "Don't apply changes"
-msgstr "Undlad at udføre ændringer"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:83
-msgid "Please select which property changes you want to apply."
-msgstr "Vælg hvilke ændringer af egenskaber som du vil gennemføre."
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:96
-msgid "Properties of "
-msgstr "Egenskaber for "
-
-#: ../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 "Automatisk tag-rettelse"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:314
-#, java-format
-msgid "Malformed config file at lines {0}"
-msgstr "Fejl i konfigurationsfilen ved linjerne {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:324
-#, java-format
-msgid "Cannot open preferences directory: {0}"
-msgstr "Kan ikke åbne mappen for indstillinger: {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 ""
-"Indstillings-filen rummede fejl. Opretter en backup af den gamle fil til {0}."
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:79
-#, java-format
-msgid "Preferences stored on {0}"
-msgstr "Indstillinger er gemt på {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:82
-#, java-format
-msgid "Could not upload preferences. Reason: {0}"
-msgstr "Kunne ikke sende indstillinger. Årsag: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:93
-msgid "Could not load preferences from server."
-msgstr "Kunne ikke hente indstillinger fra serveren."
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:34
-msgid "different"
-msgstr "anderledes"
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:262
-msgid "deleted"
-msgstr "slettet"
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
-msgid "true"
-msgstr "sand"
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
-msgid "false"
-msgstr "falsk"
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20
-msgid "position"
-msgstr "position"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30
-msgid "Decimal Degrees"
-msgstr "decimalgrader"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
-msgid "Degrees Minutes Seconds"
-msgstr "Grader minutter sekunder"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
-msgid "S"
-msgstr "S"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
-msgid "N"
-msgstr "N"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
-msgid "W"
-msgstr "V"
-
-#: ../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 "ufuldstændig"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
-#, java-format
-msgid "Error: {0}"
-msgstr "Fejl: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
-#, java-format
-msgid "Warning: {0}"
-msgstr "Advarsel: {0}"
-
-#: ../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"
@@ -2375,5 +2613,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:122
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "railway"
 msgstr "jernbane"
@@ -2395,4 +2633,62 @@
 msgstr[1] "{0} punkter"
 
+#: ../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."
@@ -2540,5 +2836,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 "baggrund"
@@ -2562,5 +2858,5 @@
 msgstr ""
 "Projiceringen \"{0}\" er kun beregnet for\n"
-"breddegrader mellem 46.1° and 57°.\n"
+"breddegrader mellem 46,1° og 57°.\n"
 "Brug et andet projiceringssystem, hvis du ikke benytter\n"
 "en fransk WMS-server.\n"
@@ -2598,4 +2894,9 @@
 "Do not upload any data after this message."
 msgstr ""
+"Projiceringen \"{0}\" er kun beregnet for\n"
+"breddegrader mellem 45,7° og47,9°.\n"
+"Brug et andet projiceringssystem, hvis du ikke arbejder\n"
+"med et datasæt fra Schweiz eller Liechtenstein.\n"
+"Upload ikke noget data efter denne besked."
 
 #: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:138
@@ -2616,8 +2917,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
@@ -2629,7 +2930,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
@@ -2737,10 +3038,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 "Brugernavn"
 
 #: ../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 "Kodeord"
@@ -2835,22 +3136,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:146
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148
 msgid "File"
 msgstr "Filer"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150
 msgid "View"
 msgstr "Vis"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:149
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151
 msgid "Tools"
 msgstr "Funktioner"
 
-#: ../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 "Forudindstillinger"
 
-#: ../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
@@ -2863,21 +3164,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 "Trådnet-visning"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:218
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221
 msgid "Toggle Wireframe view"
 msgstr "Skift trådnet-visning"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:244
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:247
 msgid "Full Screen"
 msgstr "Fuldskærm"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:246
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:249
 msgid "Toggle Full Screen view"
 msgstr "Skift fra og til Fuldskærm"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:286
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:289
 msgid "Audio"
 msgstr "Lyd"
@@ -2949,6 +3250,6 @@
 msgstr "(intet objekt)"
 
-#: ../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 "lag er ikke i listen"
@@ -2958,9 +3259,9 @@
 msgstr "Kontakter OSM-serveren..."
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:104
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:105
 msgid "Error while parsing"
 msgstr "Fejl ved fortolkning"
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:107
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:108
 msgid "File not found"
 msgstr "Filen blev ikke fundet"
@@ -3033,5 +3334,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 "Medlemmer"
@@ -3227,5 +3528,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
@@ -3307,5 +3608,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 ""
@@ -3344,5 +3645,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 ""
 
@@ -3396,5 +3697,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 "Rolle"
@@ -3498,5 +3799,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
@@ -3808,5 +4109,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 "Relationer"
@@ -3911,66 +4212,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 "Anvend ændringer"
 
-#: ../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 "Grundlæggende"
 
-#: ../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 "Optaget af"
 
-#: ../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 "Tags (tom værdi fjerner tag)"
 
-#: ../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 "Flyt op"
 
-#: ../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 "Flyt det nuværende valgte medlem op"
 
-#: ../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 "Tilføj valgte"
 
-#: ../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 "Tilføj alle valgte objekter som medlemmer"
 
-#: ../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 "Fjern valgt"
 
-#: ../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 "Fjern alle valgte objekter fra relation"
 
-#: ../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 "Flyt ned"
 
-#: ../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 "Flyt det nuværende valgte medlem ned"
 
-#: ../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 "Fjern medlemmet i den nuværende tabelrække fra denne relation"
 
-#: ../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 "Hent medlemmer"
 
-#: ../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 "Hent alle ufuldstændige veje og punkter der er forbundet"
@@ -4015,5 +4316,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
@@ -4034,9 +4335,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 "ja"
 
-#: ../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
@@ -4058,31 +4359,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 "nej"
 
-#: ../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 "Medlemmer: {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 "Relations-editor: {0}"
 
-#: ../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 "Der var konflikter ved import."
 
-#: ../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 "Fejl i fortolkning af server-svar."
 
-#: ../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 "Kan ikke forbinde til serveren."
+
+#: ../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
@@ -4148,17 +4452,17 @@
 msgstr "Datakilder og typer"
 
-#: ../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 "Hent som nyt lag"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:174
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:173
 msgid "Download Area"
 msgstr "Hent område"
 
-#: ../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 "Området er for stort; vil sandsynligvis blive afvist af serveren"
 
-#: ../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 ""
@@ -4188,5 +4492,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 "Steder"
@@ -4233,21 +4537,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 "type"
@@ -4287,14 +4591,4 @@
 msgid "Tile Numbers"
 msgstr "Tern-nummer"
-
-#: ../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 "Du kan bruge musen eller Ctrl+piletaster/./ for at zoome og panorere."
-
-#. 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 "Kort"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:98
@@ -4373,5 +4667,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)"
@@ -4487,14 +4781,14 @@
 msgstr "Wave-lydfiler (*.wav)"
 
-#: ../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 "Lyd-markører fra {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244
 msgid "Import images"
 msgstr "Importér billeder"
 
-#: ../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, "
@@ -4503,5 +4797,5 @@
 msgstr[1] "{0} spor, "
 
-#: ../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, "
@@ -4510,5 +4804,5 @@
 msgstr[1] "{0} ruter, "
 
-#: ../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"
@@ -4517,28 +4811,28 @@
 msgstr[1] "{0} punkter"
 
-#: ../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 "Navn: {0}"
 
-#: ../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 "Beskrivelse: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347
 msgid "Timespan: "
 msgstr "Tidshorisont: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354
 msgid "Length: "
 msgstr "Længde: "
 
-#: ../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 "Konvertér til datalag"
 
-#: ../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 ""
@@ -4549,11 +4843,11 @@
 "<br>Hvis du vil uploade traces, så kig her:"
 
-#: ../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
@@ -4563,29 +4857,29 @@
 msgstr "Konverteret fra: {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 "Hent fra OSM langs dette spor"
 
-#: ../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 "Hent alt inden for:"
 
-#: ../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 "{0} meter"
 
-#: ../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 "{0} km²"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:822
 #, java-format
 msgid ""
@@ -4596,10 +4890,10 @@
 "du<br>at fortsætte?</html>"
 
-#: ../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 ""
 "Ingen GPX-spor er tilgængelige i laget, som der kan associeres lyd med."
 
-#: ../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 "
@@ -4607,5 +4901,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 "
@@ -4613,33 +4907,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 "uden for det hentede område"
 
-#: ../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 "{0} består af:"
 
-#: ../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} slettet.)"
 
-#: ../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"
@@ -4647,21 +4950,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"
@@ -4807,5 +5110,5 @@
 "endnu)"
 
-#: ../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
@@ -4814,5 +5117,5 @@
 msgstr "Vælg venligst rækken, der skal rettes."
 
-#: ../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
@@ -4820,5 +5123,5 @@
 msgstr "Ny værdi for {0}"
 
-#: ../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
@@ -4828,5 +5131,5 @@
 msgstr "Vælg venligst rækken, der skal slettes"
 
-#: ../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 "Indtast et nyt nøgle/værdi-sæt"
@@ -5703,106 +6006,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 "Navn"
@@ -6277,6 +6580,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:36
-msgid "Login name (email) to the OSM account."
-msgstr "Login-navn (e-mail) til OSM-kontoen."
+msgid "Login name (e-mail) to the OSM account."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
@@ -6292,6 +6595,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
-msgid "OSM username (email)"
-msgstr "OSM-brugernavn (e-mail)"
+msgid "OSM username (e-mail)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
@@ -6302,10 +6605,7 @@
 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 ""
-"<html>ADVARSEL: Kodeordet er gemt i klar tekst.<br>Det bliver sendt i klar "
-"tekst til serveren, integreret i URLen.<br><br>Brug ikke et værdifuldt "
-"kodeord.</b></html>"
 
 #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on
@@ -6605,6 +6905,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 "Kontakter OSM-serveren..."
@@ -6615,7 +6916,7 @@
 msgstr "Henter punkter {0} til {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 "Downloader OSM-data..."
@@ -6680,15 +6981,14 @@
 msgstr "Fejl ved NMEAimport!"
 
-#: ../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 ""
@@ -6697,31 +6997,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 "Åbner rettesæt..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:351
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298
 msgid "Closing changeset..."
 msgstr "Lukker rettesæt..."
 
-#: ../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 "Forbereder..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:381
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:326
 msgid "Uploading..."
 msgstr "Uploader..."
@@ -6736,25 +7042,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 "Forkert brugernavn eller kodeord"
 
-#: ../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 "Advarsel: Kodeordet sendes ukrypteret."
 
-#: ../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 "Gem brugernavn og kodeord (ukrypteret)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:89
 msgid "Enter Password"
 msgstr "Indtast kodeord"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
 msgid "Login"
 msgstr "Login"
 
-#: ../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..."
@@ -6765,4 +7071,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."
@@ -6856,9 +7205,23 @@
 msgstr "Defekt id for punkt"
 
-#: ../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 "Forbinder til server..."
 
-#: ../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."
@@ -6866,17 +7229,9 @@
 "Kunne ikke forbinde til osm server. Tjek venligst din internetforbindelse."
 
-#: ../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 ""
-"Serveren returnerede en intern fejl. Prøv med et mindre område eller prøv "
-"igen om kort tid."
-
-#: ../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 ""
 
@@ -6892,5 +7247,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 "Hent udvidelser"
@@ -7080,9 +7435,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 "Hent manglende udvidelser"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:128
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:119
 #, java-format
 msgid ""
@@ -7095,6 +7450,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
@@ -7117,35 +7472,35 @@
 msgstr "ukendt"
 
-#: ../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}: Version {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 "Udvidelse som følger med JOSM"
 
-#: ../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 "Fejl ved indlæsning af fil med udvidelsesinformationer: {0}"
 
-#: ../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 "Dette er efter afslutningen på optagelsen"
 
-#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:329
+#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:340
 msgid "Error playing sound"
 msgstr "Fejl ved lydafspilning"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
 msgid "Do nothing"
 msgstr "Foretag intet"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
 msgid "Report Bug"
 msgstr "Rapportér fejl"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:52
 msgid ""
 "An unexpected exception occurred.\n"
@@ -7159,19 +7514,19 @@
 "udgave af JOSM, kan du hjælpe ved at sende en fejlrapport."
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55
 msgid "Unexpected Exception"
 msgstr "Uventet handling"
 
-#: ../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 "Send venligst en fejlrapport på {0}"
 
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:67
+msgid "Include your steps to get to the error (as detailed as possible)!"
+msgstr ""
+"Beskriv de trin, du foretog for at få fejlen (så detaljeret som muligt)!"
+
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:68
-msgid "Include your steps to get to the error (as detailed as possible)!"
-msgstr ""
-"Beskriv de trin, du foretog for at få fejlen (så detaljeret som muligt)!"
-
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69
 msgid ""
 "Try updating to the newest version of JOSM and all plugins before reporting "
@@ -7181,9 +7536,9 @@
 "indsender en fejlrapport."
 
-#: ../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 "Husk at nævne følgende informationer:"
 
-#: ../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 "(teksten er allerede kopieret til til din udklipsholder.)"
@@ -7267,5 +7622,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 "Beskrivelse"
@@ -7646,5 +8001,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 ""
@@ -7678,5 +8033,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"
@@ -7699,5 +8053,5 @@
 msgstr "Lambert Zone 4 cache-fil (.4)"
 
-#: ../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
@@ -7736,10 +8090,10 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:165
 msgid "Invalid projection"
-msgstr ""
+msgstr "Ugyldig projicering"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:166
 #, java-format
 msgid "Change the projection to {0} first."
-msgstr ""
+msgstr "Skift først projiceringen til {0}."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:170
@@ -7748,4 +8102,6 @@
 "the JOSM projection to Lambert and restart"
 msgstr ""
+"Hvis du vil aktivere Cadastre-WMS-udvidelsen, så ret\n"
+"JOSM-projiceringen til Lambert og genstart"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:205
@@ -7790,6 +8146,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/"
@@ -7868,6 +8224,6 @@
 msgstr "Tilføj \"source=...\" til elementer?"
 
-#: ../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
@@ -7875,11 +8231,11 @@
 msgstr "Henter {0}"
 
-#: ../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 "Kontakter WMS-server..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:157
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:158
 msgid "Create buildings"
 msgstr "Opret bygninger"
@@ -7896,13 +8252,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 ""
@@ -7923,5 +8279,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 ""
 
@@ -8014,5 +8370,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
@@ -8020,59 +8376,28 @@
 msgstr "Tomt lag"
 
+#: ../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 "Fil format fejl"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:481
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:401
 #, java-format
 msgid ""
@@ -8081,14 +8406,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 ""
@@ -8183,11 +8508,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 "Importér rute fra GPX-lag"
 
 #: ../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 "Slet eksisterende rute"
@@ -8197,5 +8522,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 "Intet GPX-datalag blev fundet"
@@ -8482,4 +8807,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 ""
 
@@ -8792,42 +9121,42 @@
 msgstr "LiveGPS"
 
-#: ../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 "Nulstil"
 
-#: ../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 "Nulstil de nuværende måleresultater og slet måleruten."
 
-#: ../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 "Rutelængde"
 
-#: ../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 "Vinkel"
 
-#: ../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 "Vinkel mellem to valgte punkter"
 
-#: ../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 ""
@@ -8884,6 +9213,6 @@
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
-msgid "Open the OpenStreetBugs window and activate the automatic download"
-msgstr "Åbner OpenStreetBugs-vinduet og aktiverer den automatiske download"
+msgid "Opens the OpenStreetBugs window and activates the automatic download"
+msgstr ""
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:123
@@ -8960,5 +9289,5 @@
 msgstr "Osmarender"
 
-#: ../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 "
@@ -8968,9 +9297,9 @@
 "under indstillingerne."
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:123
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:127
 msgid "osmarender options"
 msgstr "osmarender-indstillinger"
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:124
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:128
 msgid "Firefox executable"
 msgstr "Firefox-programfil"
@@ -9397,5 +9726,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 "Vejnavn"
@@ -9485,5 +9814,5 @@
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:195
-msgid "No intersections found. Nothing was changed."
+msgid "No intersection found. Nothing was changed."
 msgstr ""
 
@@ -10361,42 +10690,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 ""
-"Du kan tilføje, rette og slette WMS-enheder i WMSudvidelses-"
-"indstillingsfanebladet - de vil derefter blive vist i WMS-menuen.\n"
-"\n"
-"Du kan også rette dette manuelt i avancerede indstillinger ved at bruge "
-"følgende notation:\n"
-"wmsplugin.url.1.name=Landsat\n"
-"wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n"
-"wmsplugin.url.2.name=NPE Maps... etc\n"
-"\n"
-"Eksempel på fuld WMS URL-inputformat (landsat)\n"
-"http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n"
-"layers=global_mosaic&styles=&srs=EPSG:4326&\n"
-"format=image/jpeg \n"
-"\n"
-"For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/  skal du "
-"kun bruge det relevante 'id' som input..\n"
-"Vil du tilføje et Metacarta Map Rectifier-menupunkt manuelt, opret da en URL "
-"manuelt som i dette eksempel, hvor du erstatter 63 med dit billede-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"
-"Bemærk: Vær sikker på at billedet er hensigtsmæssigt at bruge ud fra "
-"ophavsretsmæssige betragtninger. Er du i tvivl, så undlad at bruge billedet."
-
-#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:54
+
+#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:53
 msgid "WMS Plugin Help"
 msgstr ""
@@ -10455,5 +10760,5 @@
 msgstr "Tilpas positionen for det valgte WMS-lag"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113
 #, java-format
 msgid ""
@@ -10498,4 +10803,29 @@
 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 "Fil format fejl"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:163
@@ -10588,4 +10918,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 ""
@@ -10600,5 +10935,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 ""
 
@@ -10891,5 +11226,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 "Reference"
@@ -11391,5 +11726,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 ""
@@ -11858,7 +12193,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 "Type"
@@ -12474,10 +12809,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 "Selskab"
@@ -12689,7 +13024,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 "Højde"
@@ -13621,5 +13956,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 "Gebyr"
@@ -13755,5 +14090,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 "Spornummer"
@@ -13761,5 +14096,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 "Område"
@@ -13811,11 +14146,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 "Rutebil-platform"
 
 #. item
-#: build/trans_presets.java:1504
+#: build/trans_presets.java:1505
 msgid "Edit Bus Platform"
 msgstr "Ret rutebil-platform"
@@ -13823,5 +14168,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1512
+#: build/trans_presets.java:1513
 msgid "Taxi"
 msgstr "Taxi"
@@ -13829,5 +14174,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 "Ret taxiholdeplads"
@@ -13835,5 +14180,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1519
+#: build/trans_presets.java:1520
 msgid "Airport"
 msgstr "Lufthavn"
@@ -13841,15 +14186,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 "Ret lufthavn"
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1526
+#: build/trans_presets.java:1527
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1527
+#: build/trans_presets.java:1528
 msgid "ICAO"
 msgstr "ICAO"
@@ -13858,5 +14203,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1532
+#: build/trans_presets.java:1533
 msgid "Accomodation"
 msgstr "Overnatning"
@@ -13868,5 +14213,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 "Hotel"
@@ -13875,15 +14220,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 "Ret hotel"
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1539
+#: build/trans_presets.java:1540
 msgid "Stars"
 msgstr "Stjerner"
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1541
+#: build/trans_presets.java:1542
 msgid "Motel"
 msgstr "Motel"
@@ -13891,20 +14236,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 "Ret motel"
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1547
+#: build/trans_presets.java:1548
 msgid "Guest House"
 msgstr "Gæstehus"
 
 #. item
-#: build/trans_presets.java:1548
+#: build/trans_presets.java:1549
 msgid "Edit Guest House"
 msgstr "Ret gæstehus"
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1552
+#: build/trans_presets.java:1553
 msgid "Chalet"
 msgstr "Feriehytte"
@@ -13912,10 +14257,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 "Ret feriehytte"
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1558
+#: build/trans_presets.java:1559
 msgid "Hostel"
 msgstr "Vandrerhjem"
@@ -13923,30 +14268,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 "Ret vandrerhjem"
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1564
+#: build/trans_presets.java:1565
 msgid "Alpine Hut"
 msgstr "Alpin hytte"
 
 #. item
-#: build/trans_presets.java:1565
+#: build/trans_presets.java:1566
 msgid "Edit Alpine Hut"
 msgstr "Redigér alpin hytte"
 
 #. 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 "Camping plads"
@@ -13954,10 +14299,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 "Redigér camping plads"
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1582
+#: build/trans_presets.java:1583
 msgid "Food+Drinks"
 msgstr "Mad+drikke"
@@ -13968,5 +14313,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 "Restaurant"
@@ -13974,5 +14319,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 "Ret restaurant"
@@ -13980,5 +14325,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 "Køkken"
@@ -13986,61 +14331,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 "italiensk"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "chinese"
 msgstr "kinesisk"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "burger"
 msgstr "burger"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "greek"
 msgstr "græsk"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "german"
 msgstr "tysk"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "indian"
 msgstr "indisk"
 
-#: 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 "kebab"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "turkish"
 msgstr "tyrkisk"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "asian"
 msgstr "asiatisk"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "thai"
 msgstr "thai"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "mexican"
 msgstr "mexicansk"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "japanese"
 msgstr "japansk"
 
-#: build/trans_presets.java:1590
+#: build/trans_presets.java:1591
 msgid "Fast Food"
 msgstr "Fastfood"
@@ -14048,9 +14393,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 "Ret fastfood-restaurant"
 
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1598
 msgid "Cafe"
 msgstr "Café"
@@ -14058,10 +14403,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 "Ret café"
 
 #. item "Food+Drinks/Cafe" text "Name"
-#: build/trans_presets.java:1603
+#: build/trans_presets.java:1604
 msgid "Pub"
 msgstr "Pub"
@@ -14069,20 +14414,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 "Ret pub"
 
 #. item "Food+Drinks/Pub" text "Name"
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1610
 msgid "Biergarten"
 msgstr "Ølhal"
 
 #. item
-#: build/trans_presets.java:1610
+#: build/trans_presets.java:1611
 msgid "Edit Biergarten"
 msgstr "Redigér Ølhal"
 
 #. item "Food+Drinks/Biergarten" text "Name"
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1615
 msgid "Bar"
 msgstr "Bar"
@@ -14090,10 +14435,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 "Redigér bar"
 
 #. item "Food+Drinks/Bar" text "Name"
-#: build/trans_presets.java:1620
+#: build/trans_presets.java:1621
 msgid "Nightclub"
 msgstr "Natklub"
@@ -14101,20 +14446,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 "Ret natklub"
 
 #. item "Food+Drinks/Nightclub" text "Name"
-#: build/trans_presets.java:1627
+#: build/trans_presets.java:1628
 msgid "Tourism"
 msgstr "Turisme"
 
 #. group "Tourism"
-#: build/trans_presets.java:1628
+#: build/trans_presets.java:1629
 msgid "Attraction"
 msgstr "Forlystelse"
 
 #. item
-#: build/trans_presets.java:1629
+#: build/trans_presets.java:1630
 msgid "Edit Attraction"
 msgstr "Ret forlystelse"
@@ -14123,11 +14468,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 "Åbningstider"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1634
+#: build/trans_presets.java:1635
 msgid "Museum"
 msgstr "Museum"
@@ -14135,10 +14480,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 "Ret museum"
 
 #. item "Tourism/Museum" text "Name"
-#: build/trans_presets.java:1640
+#: build/trans_presets.java:1641
 msgid "Zoo"
 msgstr "Zoo"
@@ -14147,10 +14492,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 "Ret zoo"
 
 #. item "Tourism/Zoo" text "Name"
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1648
 msgid "Viewpoint"
 msgstr "Udsigtspunkt"
@@ -14158,25 +14503,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 "Redigér udsigtspunkt"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1652
+#: build/trans_presets.java:1653
 msgid "Look-Out Tower"
 msgstr "Udkigstårn"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1654
+#: build/trans_presets.java:1655
 msgid "Theme Park"
 msgstr "Forlystelsespark"
 
 #. item
-#: build/trans_presets.java:1655
+#: build/trans_presets.java:1656
 msgid "Edit Theme Park"
 msgstr "Ret forlystelsespark"
 
 #. item "Tourism/Theme Park" text "Name"
-#: build/trans_presets.java:1659
+#: build/trans_presets.java:1660
 msgid "Artwork"
 msgstr "Kunstværk"
@@ -14184,5 +14529,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 "Redigér kunstværk"
@@ -14190,5 +14535,5 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1667
 msgid "Information Office"
 msgstr "Informationskontor"
@@ -14196,83 +14541,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 "Redigér informationskontor"
 
+#. item "Tourism/Information Office" text "Opening Hours"
+#: build/trans_presets.java:1675
+msgid "Map"
+msgstr "Kort"
+
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1679
 msgid "Map Type"
 msgstr "Kort type"
 
 #. item "Tourism/Map" combo "Map Type"
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1679
 msgid "map"
 msgstr "kort"
 
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1679
 msgid "citymap"
 msgstr "bykort"
 
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1679
 msgid "hikingmap"
 msgstr "vandrekort"
 
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1679
 msgid "bicyclemap"
 msgstr "cykelkort"
 
 #. 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 "Nærmere beskrivelse"
 
 #. 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 "historie"
 
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1686
 msgid "nature"
 msgstr "natur"
 
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1686
 msgid "wildlife"
 msgstr "dyreliv"
 
 #. 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 ""
@@ -14280,25 +14622,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 "Bålplads"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1709
 msgid "Picnic Site"
 msgstr "Picnic sted"
 
 #. item
-#: build/trans_presets.java:1709
+#: build/trans_presets.java:1710
 msgid "Edit Picnic Site"
 msgstr "Redigér picnic sted"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1716
 msgid "Historic Places"
 msgstr "Historiske steder"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1716
+#: build/trans_presets.java:1717
 msgid "Castle"
 msgstr "Borg"
@@ -14307,20 +14649,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 "Ret borg"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1724
 msgid "Ruins"
 msgstr "Ruiner"
 
 #. item
-#: build/trans_presets.java:1724
+#: build/trans_presets.java:1725
 msgid "Edit Ruins"
 msgstr "Ret ruiner"
 
 #. item "Historic Places/Ruins" text "Name"
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1729
 msgid "Archaeological Site"
 msgstr "Arkæologisk sted"
@@ -14329,10 +14671,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 "Ret arkæologisk sted"
 
 #. item "Historic Places/Archaeological Site" text "Name"
-#: build/trans_presets.java:1735
+#: build/trans_presets.java:1736
 msgid "Battlefield"
 msgstr "Slagmark"
@@ -14340,5 +14682,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 "Ret slagmark"
@@ -14346,15 +14688,15 @@
 #. item "Historic Places/Battlefield" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1743
 msgid "Monument"
 msgstr "Monument"
 
 #. item
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1744
 msgid "Edit Monument"
 msgstr "Ret monument"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1748
 msgid "Memorial"
 msgstr "Mindesmærke"
@@ -14362,45 +14704,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 "Ret mindesmærke"
 
 #. 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 "Rekreation"
 
 #. group "Leisure"
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1766
 msgid "Water Park"
 msgstr "Badeland"
 
 #. item
-#: build/trans_presets.java:1766
+#: build/trans_presets.java:1767
 msgid "Edit Water Park"
 msgstr "Ret badeland"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1770
+#: build/trans_presets.java:1771
 msgid "Playground"
 msgstr "Legeplads"
@@ -14408,15 +14750,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 "Ret legeplads"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1776
+#: build/trans_presets.java:1777
 msgid "Fishing"
 msgstr "Fiskeri"
 
 #. item
-#: build/trans_presets.java:1777
+#: build/trans_presets.java:1778
 msgid "Edit Fishing"
 msgstr "Ret fiskeri"
@@ -14424,15 +14766,15 @@
 #. item "Leisure/Fishing" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1783
+#: build/trans_presets.java:1784
 msgid "Sport Facilities"
 msgstr "Sportsfaciliteter"
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1784
+#: build/trans_presets.java:1785
 msgid "Stadium"
 msgstr "Stadion"
 
 #. item
-#: build/trans_presets.java:1785
+#: build/trans_presets.java:1786
 msgid "Edit Stadium"
 msgstr "Ret stadion"
@@ -14446,6 +14788,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 "vælg sportsgren:"
@@ -14821,6 +15163,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
@@ -14853,227 +15195,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 "multi"
 
-#: 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 "bueskydning"
 
-#: 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 "atletik"
 
-#: 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 "australsk fodbold"
 
-#: 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 "baseball"
 
-#: 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 "basketball"
 
-#: 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 "petanque"
 
-#: 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 "kano"
 
-#: 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 "klatring"
 
-#: 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 "cricket"
 
-#: 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 "kroket"
 
-#: 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 "hundeløb"
 
-#: 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 "ridning"
 
-#: 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 "golf"
 
-#: 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 "gymnastik"
 
-#: 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 "travbane"
 
-#: 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 "motor"
 
-#: 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 "pelota"
 
-#: 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 "rugby"
 
-#: 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 "skydebane"
 
-#: 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 "skateboard"
 
-#: 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 "skating"
 
-#: 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 "skisport"
 
-#: 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 "fodbold"
 
-#: 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 "svømning"
 
-#: 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 "bordtennis"
 
-#: 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 "tennis"
 
-#: build/trans_presets.java:1793
+#: build/trans_presets.java:1794
 msgid "Sports Centre"
 msgstr "Idrætscenter"
 
 #. item
-#: build/trans_presets.java:1794
+#: build/trans_presets.java:1795
 msgid "Edit Sports Centre"
 msgstr "Ret idrætscenter"
 
-#: 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 "Golfbane"
 
 #. item
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1822
 msgid "Edit Golf Course"
 msgstr "Ret golfbane"
 
 #. item "Sport Facilities/Golf Course" text "Name"
-#: build/trans_presets.java:1825
+#: build/trans_presets.java:1826
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item
-#: build/trans_presets.java:1826
+#: build/trans_presets.java:1827
 msgid "Edit Miniature Golf"
 msgstr "Ret minigolf"
 
 #. item "Sport Facilities/Miniature Golf" text "Name"
-#: build/trans_presets.java:1831
+#: build/trans_presets.java:1832
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1833
 msgid "Multi"
 msgstr "Multi"
 
 #. item
-#: build/trans_presets.java:1833
+#: build/trans_presets.java:1834
 msgid "Edit Multi"
 msgstr "Ret multi"
@@ -15112,191 +15454,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 "bane"
 
-#: 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 "stadion"
 
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1839
 msgid "10pin"
 msgstr "Bowling"
 
 #. item
-#: build/trans_presets.java:1839
+#: build/trans_presets.java:1840
 msgid "Edit 10pin"
 msgstr "Ret bowling"
 
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1845
 msgid "Athletics"
 msgstr "Atletik"
 
 #. item
-#: build/trans_presets.java:1845
+#: build/trans_presets.java:1846
 msgid "Edit Athletics"
 msgstr "Ret atletik"
 
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1851
 msgid "Archery"
 msgstr "Bueskydning"
 
 #. item
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:1852
 msgid "Edit Archery"
 msgstr "Ret bueskydning"
 
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:1857
 msgid "Climbing"
 msgstr "Klatring"
 
 #. item
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:1858
 msgid "Edit Climbing"
 msgstr "Ret klatring"
 
-#: 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 "Cykling"
 
 #. item
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1870
 msgid "Edit Cycling"
 msgstr "Redigér cykling"
 
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1875
 msgid "Dog Racing"
 msgstr "Hundeløb"
 
 #. item
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1876
 msgid "Edit Dog Racing"
 msgstr "Ret hundeløb"
 
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1881
 msgid "Equestrian"
 msgstr "Ridning"
 
 #. item
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:1882
 msgid "Edit Equestrian"
 msgstr "Ret ridning"
 
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1887
 msgid "Horse Racing"
 msgstr "Galopbane"
 
 #. item
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1888
 msgid "Edit Horse Racing"
 msgstr "Ret galopbane"
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:1893
 msgid "Gymnastics"
 msgstr "Gymnastik"
 
 #. item
-#: build/trans_presets.java:1893
+#: build/trans_presets.java:1894
 msgid "Edit Gymnastics"
 msgstr "Ret gymnastik"
 
-#: build/trans_presets.java:1898
+#: build/trans_presets.java:1899
 msgid "Motor Sports"
 msgstr "Motorsport"
 
 #. item
-#: build/trans_presets.java:1899
+#: build/trans_presets.java:1900
 msgid "Edit Motor Sports"
 msgstr "Ret motorsport"
 
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:1905
 msgid "Skating"
 msgstr "Skating"
 
 #. item
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:1906
 msgid "Edit Skating"
 msgstr "Ret skating"
 
-#: build/trans_presets.java:1910
+#: build/trans_presets.java:1911
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:1912
 msgid "Edit Skateboard"
 msgstr "Ret Skateboard"
 
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:1917
 msgid "Swimming"
 msgstr "Svømning"
 
 #. item
-#: build/trans_presets.java:1917
+#: build/trans_presets.java:1918
 msgid "Edit Swimming"
 msgstr "Ret svømning"
 
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:1923
 msgid "Skiing"
 msgstr "Skisport"
@@ -15304,56 +15646,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 "Ret skisport"
 
 #. 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 ""
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:1929
 msgid "novice"
 msgstr "nybegynder"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:1929
 msgid "easy"
 msgstr "let"
 
-#: 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 "avanceret"
 
-#: 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 "Skydning"
@@ -15361,178 +15703,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 "Ret skydning"
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1940
 msgid "Sport (Ball)"
 msgstr "Sport (bold)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1941
 msgid "Soccer"
 msgstr "Fodbold"
 
 #. item
-#: build/trans_presets.java:1941
+#: build/trans_presets.java:1942
 msgid "Edit Soccer"
 msgstr "Ret fodbold"
 
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:1947
 msgid "Football"
 msgstr "Amerikansk fodbold"
 
 #. item
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:1948
 msgid "Edit Football"
 msgstr "Ret amerikansk fodbold"
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1953
 msgid "Australian Football"
 msgstr "Australsk fodbold"
 
 #. item
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:1954
 msgid "Edit Australian Football"
 msgstr "Ret australsk fodbold"
 
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:1959
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:1960
 msgid "Edit Baseball"
 msgstr "Ret Baseball"
 
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:1965
 msgid "Basketball"
 msgstr "Basketball"
 
 #. item
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:1966
 msgid "Edit Basketball"
 msgstr "Ret Basketball"
 
-#: 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 "Ret Golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1975
 msgid "golf_course"
 msgstr "Golfbane"
 
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:1977
 msgid "Boule"
 msgstr "Petanque"
 
 #. item
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:1978
 msgid "Edit Boule"
 msgstr "Ret petanque"
 
-#: 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 "Cricket"
 
 #. item
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:1990
 msgid "Edit Cricket"
 msgstr "Ret cricket"
 
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:1995
 msgid "Cricket Nets"
 msgstr "Cricketnet"
 
 #. item
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:1996
 msgid "Edit Cricket Nets"
 msgstr "Ret cricketnet"
 
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:2001
 msgid "Croquet"
 msgstr "Kroket"
 
 #. item
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:2002
 msgid "Edit Croquet"
 msgstr "Ret kroket"
 
-#: build/trans_presets.java:2006
+#: build/trans_presets.java:2007
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item
-#: build/trans_presets.java:2007
+#: build/trans_presets.java:2008
 msgid "Edit Hockey"
 msgstr "Ret hockey"
 
-#: build/trans_presets.java:2012
+#: build/trans_presets.java:2013
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2014
 msgid "Edit Pelota"
 msgstr "Ret pelota"
 
-#: 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 "Rugby"
 
 #. item
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2026
 msgid "Edit Rugby"
 msgstr "Ret rugby"
 
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:2031
 msgid "Table Tennis"
 msgstr "Bordtennis"
 
 #. item
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2032
 msgid "Edit Table Tennis"
 msgstr "Ret bordtennis"
 
-#: 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 "Ret tennis"
 
 #. <separator/>
-#: build/trans_presets.java:2044
+#: build/trans_presets.java:2045
 msgid "Buildings"
 msgstr "Bygninger"
 
 #. group "Buildings"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2046
 msgid "Building"
 msgstr "Bygning"
@@ -15540,5 +15882,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2049
 msgid "Public Building"
 msgstr "Offentlig bygning"
@@ -15546,10 +15888,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 "Ret offentlig bygning"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2055
 msgid "Town hall"
 msgstr "Rådhus"
@@ -15557,10 +15899,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 "Ret rådhus"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2061
 msgid "Embassy"
 msgstr "Ambassade"
@@ -15568,10 +15910,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 "Ret ambassade"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2066
+#: build/trans_presets.java:2067
 msgid "Courthouse"
 msgstr "Domhus"
@@ -15580,10 +15922,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 "Ret domhus"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2074
 msgid "Prison"
 msgstr "Fængsel"
@@ -15592,10 +15934,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 "Ret fængsel"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2080
+#: build/trans_presets.java:2081
 msgid "Police"
 msgstr "Politi"
@@ -15605,10 +15947,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 "Ret politi"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2089
 msgid "Fire Station"
 msgstr "Brandstation"
@@ -15617,10 +15959,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 "Ret brandstation"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2096
 msgid "Post Office"
 msgstr "Posthus"
@@ -15628,5 +15970,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 "Ret posthus"
@@ -15634,15 +15976,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2103
 msgid "Kindergarten"
 msgstr "Børnehave"
 
 #. item
-#: build/trans_presets.java:2103
+#: build/trans_presets.java:2104
 msgid "Edit Kindergarten"
 msgstr "Ret børnehave"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2108
 msgid "School"
 msgstr "Skole"
@@ -15650,10 +15992,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 "Ret skole"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2114
 msgid "University"
 msgstr "Universitet"
@@ -15661,10 +16003,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 "Ret universitet"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2120
 msgid "College"
 msgstr ""
@@ -15672,5 +16014,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 ""
@@ -15678,5 +16020,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2126
+#: build/trans_presets.java:2127
 msgid "Cinema"
 msgstr "Biograf"
@@ -15685,10 +16027,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 "Ret biograf"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2133
+#: build/trans_presets.java:2134
 msgid "Library"
 msgstr "Bibliotek"
@@ -15697,10 +16039,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 "Ret bibliotek"
 
 #. item "Buildings/Library" text "Name"
-#: build/trans_presets.java:2140
+#: build/trans_presets.java:2141
 msgid "Arts Centre"
 msgstr "Kunstcenter"
@@ -15708,10 +16050,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 "Redigér kunstcenter"
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2146
+#: build/trans_presets.java:2147
 msgid "Theatre"
 msgstr "Teater"
@@ -15720,10 +16062,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 "Ret teater"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2154
 msgid "Place of Worship"
 msgstr "Sted for tilbedelse"
@@ -15733,5 +16075,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 "Ret sted for tilbedelse"
@@ -15740,6 +16082,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 "Religion"
@@ -15748,66 +16090,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 "bahai"
 
-#: 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 "buddhistisk"
 
-#: 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 "kristen"
 
-#: 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 "hinduistisk"
 
-#: 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 "jainistisk"
 
-#: 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 "jødisk"
 
-#: 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 "muslimsk"
 
-#: 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 "spiritistisk"
 
-#: 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 "taoistisk"
 
-#: 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 "unitar"
 
-#: 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 "zoroastristisk"
 
-#: 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 "Trosretning"
@@ -15816,81 +16158,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 "anglikansk"
 
-#: 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 "baptistisk"
 
-#: 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 "katolsk"
 
-#: 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 "evangelisk"
 
-#: 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 "Jehovas Vidner"
 
-#: 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 "luthersk"
 
-#: 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 "metodistisk"
 
-#: 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 "mormonsk"
 
-#: 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 "ortodoks"
 
-#: 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 "pinsebevægelsen"
 
-#: 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 "prebyteriansk"
 
-#: 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 "protestantisk"
 
-#: 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 "kvæker"
 
-#: 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 "shiitisk"
 
-#: 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 "sunnitisk"
 
 #. <separator/>
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2165
 msgid "Addresses"
 msgstr "Adresser"
@@ -15899,5 +16241,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 "Ret adresseinformation"
@@ -15905,5 +16247,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2169
+#: build/trans_presets.java:2170
 msgid "House number"
 msgstr "Husnummer"
@@ -15911,20 +16253,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2172
 msgid "House name"
 msgstr "Husnavn"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2174
 msgid "City name"
 msgstr "Bynavn"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2174
+#: build/trans_presets.java:2175
 msgid "Post code"
 msgstr "Postnummer"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2176
 msgid "Country code"
 msgstr "Landekode"
@@ -15932,5 +16274,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2179
 msgid "Address Interpolation"
 msgstr "Adresse-interpolering"
@@ -15939,5 +16281,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 "Ret adresse-interpolering"
@@ -15945,71 +16287,71 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2184
 msgid "Numbering scheme"
 msgstr "Nummereringssystem"
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2184
 msgid "odd"
 msgstr "ulige"
 
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2184
 msgid "even"
 msgstr "lige"
 
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2184
 msgid "all"
 msgstr "alle"
 
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2184
 msgid "alphabetic"
 msgstr "alfabetisk"
 
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2187
 msgid "Man Made"
 msgstr "Menneskeskabt"
 
 #. group "Man Made"
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2188
 msgid "Works"
 msgstr "Fabrik"
 
 #. item
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2189
 msgid "Edit Works"
 msgstr "Ret fabrik"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2193
 msgid "Tower"
 msgstr "Tårn"
 
 #. item
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2194
 msgid "Edit Tower"
 msgstr "Ret tårn"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2198
 msgid "Water Tower"
 msgstr "Vandtårn"
 
 #. item
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2199
 msgid "Edit Water Tower"
 msgstr "Ret vandtårn"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2203
 msgid "Gasometer"
 msgstr "Gasbeholder"
 
 #. item
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2204
 msgid "Edit Gasometer"
 msgstr "Ret gasbeholder"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2207
+#: build/trans_presets.java:2208
 msgid "Lighthouse"
 msgstr "Fyrtårn"
@@ -16017,10 +16359,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 "Ret fyrtårn"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2214
 msgid "Windmill"
 msgstr "Vejrmølle"
@@ -16028,10 +16370,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 "Ret vejrmølle"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2220
 msgid "Pipeline"
 msgstr "Rørledning"
@@ -16039,10 +16381,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 "Ret rørledning"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2225
+#: build/trans_presets.java:2226
 msgid "Wastewater Plant"
 msgstr "Rensningsanlæg"
@@ -16052,10 +16394,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 "Ret rensningsanlæg"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2233
+#: build/trans_presets.java:2234
 msgid "Crane"
 msgstr "Kran"
@@ -16063,10 +16405,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 "Ret kran"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2239
+#: build/trans_presets.java:2240
 msgid "Beacon"
 msgstr "Pejlemærke"
@@ -16074,10 +16416,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 "Ret Pejlemærke"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2245
+#: build/trans_presets.java:2246
 msgid "Survey Point"
 msgstr ""
@@ -16085,10 +16427,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 ""
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2252
 msgid "Surveillance"
 msgstr "Overvågning"
@@ -16096,5 +16438,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 "Ret overvågningskamera"
@@ -16102,5 +16444,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2258
+#: build/trans_presets.java:2259
 msgid "Power Generator"
 msgstr "Generator"
@@ -16110,39 +16452,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 "Ret generator"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "wind"
 msgstr "vind"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "hydro"
 msgstr "vand"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "fossil"
 msgstr "fossil"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "nuclear"
 msgstr "arom"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "coal"
 msgstr "kul"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "photovoltaic"
 msgstr "sol"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "gas"
 msgstr "gas"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2268
 msgid "Power Station"
 msgstr "Kraftværk"
@@ -16151,10 +16493,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 "Ret kraftværk"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2274
+#: build/trans_presets.java:2275
 msgid "Power Sub Station"
 msgstr "Transformatorstation"
@@ -16163,5 +16505,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 "Ret transformatorstation"
@@ -16169,10 +16511,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 "Elmast"
@@ -16183,5 +16525,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 "Ret elmast"
@@ -16189,5 +16531,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 "Strømkabel"
@@ -16196,25 +16538,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 "Ret strømkabel"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2298
 msgid "Voltage"
 msgstr "Spænding"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2299
 msgid "Amount of Wires"
 msgstr "Antal kabler"
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2301
+#: build/trans_presets.java:2302
 msgid "Amenities"
 msgstr "Faciliteter"
 
 #. group "Amenities"
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2303
 msgid "Toilets"
 msgstr "Toiletter"
@@ -16222,20 +16564,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 ""
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2312
 msgid "Post Box"
 msgstr "Postkasse"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2317
 msgid "Telephone"
 msgstr "Telefon"
@@ -16244,5 +16586,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 "Ret telefon"
@@ -16250,5 +16592,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ønter"
@@ -16256,5 +16598,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 "Sedler"
@@ -16262,5 +16604,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 ""
@@ -16268,5 +16610,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 ""
@@ -16274,15 +16616,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 "Kreditkort"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2328
 msgid "Telephone cards"
 msgstr "Telefonkort"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2330
 msgid "Recycling"
 msgstr "Genbrug"
@@ -16291,5 +16633,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 "Ret genbrugsplads"
@@ -16297,35 +16639,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 "Batterier"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2336
 msgid "Cans"
 msgstr "Dåser"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2337
 msgid "Clothes"
 msgstr "Tøj"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2338
 msgid "Glass"
 msgstr "Glas"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2339
 msgid "Paper"
 msgstr "Papir"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2340
 msgid "Scrap Metal"
 msgstr "Skrotjern"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2342
 msgid "Bench"
 msgstr "Bænk"
@@ -16334,20 +16676,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 "Skydetelt"
 
 #. item
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2347
 msgid "Edit Hunting Stand"
 msgstr "Ret skydetelt"
 
 #. item "Amenities/Hunting Stand" check "Shelter"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2350
 msgid "Hide"
 msgstr "Skjul"
 
 #. item "Amenities/Hunting Stand" check "Hide"
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2351
 msgid "Lock"
 msgstr "Lås"
@@ -16355,22 +16697,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 "Højde"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2351
+#: build/trans_presets.java:2352
 msgid "low"
 msgstr "lav"
 
-#: build/trans_presets.java:2351
+#: build/trans_presets.java:2352
 msgid "half"
 msgstr "halv"
 
-#: build/trans_presets.java:2351
+#: build/trans_presets.java:2352
 msgid "full"
 msgstr "fuld"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2354
 msgid "Fountain"
 msgstr "Springvand"
@@ -16379,10 +16721,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 "Ret springvand"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2361
 msgid "Drinking Water"
 msgstr "Vandpost"
@@ -16391,10 +16733,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 "Ret vandpost"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2367
+#: build/trans_presets.java:2368
 msgid "Baby Hatch"
 msgstr "Babyluge"
@@ -16402,25 +16744,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 "Ret babyluge"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2375
+#: build/trans_presets.java:2376
 msgid "Shops"
 msgstr "Butikker"
 
 #. group "Shops"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2377
 msgid "Supermarket"
 msgstr "Supermarked"
 
 #. item
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2378
 msgid "Edit Supermarket"
 msgstr "Ret supermarked"
 
 #. item "Shops/Supermarket" text "Name"
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:2382
 msgid "Convenience Store"
 msgstr "Købmand"
@@ -16428,10 +16770,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 "Ret købmand"
 
 #. item "Shops/Convenience Store" text "Name"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2388
 msgid "Kiosk"
 msgstr "Kiosk"
@@ -16439,10 +16781,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 "Ret kiosk"
 
 #. item "Shops/Kiosk" text "Name"
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2394
 msgid "Vending machine"
 msgstr "Automat"
@@ -16450,5 +16792,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 "Ret automat"
@@ -16456,88 +16798,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 "Varer i automat"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "public_transport_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "public_transport_plans"
 msgstr ""
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "parking_tickets"
 msgstr "P-automat"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "food"
 msgstr "mad"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "drinks"
 msgstr "drikke"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "sweets"
 msgstr ""
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "cigarettes"
 msgstr "cigaretter"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "photos"
 msgstr "billeder"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "animal_food"
 msgstr "dyremad"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "news_papers"
 msgstr "aviser"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "toys"
 msgstr "legetøj"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "stamps"
 msgstr "frimærker"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "SIM-cards"
 msgstr "SIM-kort"
 
-#: 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 "kondomer"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "tampons"
 msgstr "tamponer"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "excrement_bags"
 msgstr "høm-høm-pose"
 
 #. 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 "Slagter"
@@ -16545,10 +16887,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 "Ret slagter"
 
 #. item "Shops/Butcher" text "Name"
-#: build/trans_presets.java:2414
+#: build/trans_presets.java:2415
 msgid "Baker"
 msgstr "Bager"
@@ -16556,10 +16898,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 "Ret bager"
 
 #. item "Shops/Baker" text "Name"
-#: build/trans_presets.java:2420
+#: build/trans_presets.java:2421
 msgid "Florist"
 msgstr "Blomsterhandler"
@@ -16567,20 +16909,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 "Ret blomsterhandler"
 
 #. 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 "Sprit"
@@ -16588,60 +16930,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 "Redigér spritbutik"
 
 #. item "Shops/Alcohol" text "Name"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2438
 msgid "Beverages"
 msgstr "Drikkevarer"
 
 #. item
-#: build/trans_presets.java:2438
+#: build/trans_presets.java:2439
 msgid "Edit Beverages Shop"
 msgstr "Redigér drikkevarebutik"
 
 #. item "Shops/Beverages" text "Name"
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:2443
 msgid "Computer"
 msgstr "Computer"
 
 #. item
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2444
 msgid "Edit Computer Shop"
 msgstr "Ret computerforretning"
 
 #. item "Shops/Computer" text "Name"
-#: build/trans_presets.java:2447
+#: build/trans_presets.java:2448
 msgid "Electronics"
 msgstr "Elektronik"
 
 #. item
-#: build/trans_presets.java:2448
+#: build/trans_presets.java:2449
 msgid "Edit Electronics Shop"
 msgstr "Ret elektronikforretning"
 
 #. item "Shops/Electronics" text "Name"
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2453
 msgid "Hifi"
 msgstr "Hi-fi"
 
 #. item
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2454
 msgid "Edit Hifi Shop"
 msgstr "Ret hi-fi-forhandler"
 
 #. item "Shops/Hifi" text "Name"
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2458
 msgid "Furniture"
 msgstr "Møbelforretning"
 
 #. item
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2459
 msgid "Edit Furniture Shop"
 msgstr "Ret møbelforretning"
 
 #. item "Shops/Furniture" text "Name"
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2463
 msgid "Garden Centre"
 msgstr "Havecenter"
@@ -16649,10 +16991,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 "Redigér havecenter"
 
 #. item "Shops/Garden Centre" text "Name"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2469
 msgid "Hardware"
 msgstr ""
@@ -16660,10 +17002,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 ""
 
 #. item "Shops/Hardware" text "Name"
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2475
 msgid "Do-it-yourself-store"
 msgstr "Gør-det-selv-butik"
@@ -16671,60 +17013,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 "Ret gør-det-selv-butik"
 
 #. item "Shops/Do-it-yourself-store" text "Name"
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2481
 msgid "Stationery"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2482
 msgid "Edit Stationery Shop"
 msgstr ""
 
 #. item "Shops/Stationery" text "Name"
-#: build/trans_presets.java:2485
+#: build/trans_presets.java:2486
 msgid "Hairdresser"
 msgstr "Frisør"
 
 #. item
-#: build/trans_presets.java:2486
+#: build/trans_presets.java:2487
 msgid "Edit Hairdresser"
 msgstr "Ret frisør"
 
 #. item "Shops/Hairdresser" text "Name"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2491
 msgid "Shoes"
 msgstr "Sko"
 
 #. item
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2492
 msgid "Edit Shoe Shop"
 msgstr "Ret skobutik"
 
 #. item "Shops/Shoes" text "Name"
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2496
 msgid "Toys"
 msgstr "Legetøjsbutik"
 
 #. item
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2497
 msgid "Edit Toy Shop"
 msgstr "Redigér legetøjsbutik"
 
 #. 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 "Redigér videobutik"
 
 #. item "Shops/Video" text "Name"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2506
 msgid "Dry Cleaning"
 msgstr "Kemisk renseri"
@@ -16732,10 +17074,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 "Ret kemisk renseri"
 
 #. item "Shops/Dry Cleaning" text "Name"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2512
 msgid "Laundry"
 msgstr "Vaskeri"
@@ -16743,10 +17085,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 "Ret vaskeri"
 
 #. item "Shops/Laundry" text "Name"
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2518
 msgid "Outdoor"
 msgstr ""
@@ -16754,35 +17096,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 ""
 
 #. 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 "Ret sportsbutik"
 
 #. item "Shops/Sports" text "Name"
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2529
 msgid "Optician"
 msgstr "Optiker"
 
 #. item
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2530
 msgid "Edit Optician"
 msgstr "Ret optiker"
 
 #. item "Shops/Optician" text "Name"
-#: build/trans_presets.java:2535
+#: build/trans_presets.java:2536
 msgid "Cash"
 msgstr "Penge"
 
 #. group "Cash"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2537
 msgid "Bank"
 msgstr "Bank"
@@ -16790,5 +17132,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 "Ret bank"
@@ -16796,10 +17138,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 "Pengeautomat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2544
 msgid "Money Exchange"
 msgstr "Vekselkontor"
@@ -16807,5 +17149,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 "Ret vekselkontor"
@@ -16813,15 +17155,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 "Ret pengeautomat"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2557
 msgid "Health"
 msgstr "Sundhed"
 
 #. group "Health"
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2558
 msgid "Doctors"
 msgstr "Lægehus"
@@ -16829,20 +17171,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 "Ret lægehus"
 
 #. item "Health/Doctors" text "Name"
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2564
 msgid "Dentist"
 msgstr "Tandlæge"
 
 #. item
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2565
 msgid "Edit Dentist"
 msgstr "Ret tandlæge"
 
 #. item "Health/Dentist" text "Name"
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2569
 msgid "Pharmacy"
 msgstr "Apotek"
@@ -16850,5 +17192,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 "Ret apotek"
@@ -16856,10 +17198,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 ""
 
 #. item "Health/Pharmacy" text "Name"
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2576
 msgid "Hospital"
 msgstr "Hospital"
@@ -16867,10 +17209,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 "Ret Hospital"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2582
 msgid "Emergency Access Point"
 msgstr ""
@@ -16879,5 +17221,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 ""
@@ -16886,20 +17228,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2588
 msgid "Point Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2589
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2591
 msgid "Phone Number"
 msgstr "Telefonnummer"
 
 #. 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 "(brug forvalgskode, fx +12-345-67890)"
@@ -16907,5 +17249,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 "Dyrlæge"
@@ -16914,25 +17256,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 "Ret dyrlæge"
 
 #. 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 "Ret et kontinent"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2611
 msgid "Country"
 msgstr "Land"
 
 #. item
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2612
 msgid "Edit Country"
 msgstr "Ret land"
@@ -16940,30 +17282,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 "Stat"
 
 #. item
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2618
 msgid "Edit State"
 msgstr "Ret stat"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2622
+#: build/trans_presets.java:2623
 msgid "Region"
 msgstr "Region"
 
 #. item
-#: build/trans_presets.java:2623
+#: build/trans_presets.java:2624
 msgid "Edit Region"
 msgstr "Ret region"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2628
+#: build/trans_presets.java:2629
 msgid "County"
 msgstr "Amt"
 
 #. item
-#: build/trans_presets.java:2629
+#: build/trans_presets.java:2630
 msgid "Edit County"
 msgstr "Ret amt"
@@ -16971,15 +17313,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2635
+#: build/trans_presets.java:2636
 msgid "City"
 msgstr "By"
 
 #. item
-#: build/trans_presets.java:2636
+#: build/trans_presets.java:2637
 msgid "Edit City"
 msgstr "Ret by"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2641
+#: build/trans_presets.java:2642
 msgid "Town"
 msgstr "Mindre by"
@@ -16987,10 +17329,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 "Ret mindre by"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2649
 msgid "Suburb"
 msgstr "Forstad"
@@ -16998,25 +17340,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 "Ret forstad"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2656
 msgid "Village"
 msgstr "By"
 
 #. item
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2657
 msgid "Edit Village"
 msgstr "Ret by"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2662
 msgid "Hamlet"
 msgstr "Landsby"
 
 #. item
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2663
 msgid "Edit Hamlet"
 msgstr "Ret landsby"
@@ -17024,5 +17366,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2669
 msgid "Locality"
 msgstr "Egn"
@@ -17030,10 +17372,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 "Ret lokalitet"
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2676
 msgid "Island"
 msgstr "Ø"
@@ -17041,5 +17383,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 "Ret ø"
@@ -17047,5 +17389,5 @@
 #. item "Places/Island" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2683
+#: build/trans_presets.java:2684
 msgid "Cave Entrance"
 msgstr "Huleindgang"
@@ -17053,10 +17395,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 "Ret huleindgang"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2690
 msgid "Peak"
 msgstr "Tinde"
@@ -17064,10 +17406,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 "Ret tinde"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2697
 msgid "Glacier"
 msgstr "Gletsjer"
@@ -17075,10 +17417,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 "Ret gletsjer"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2703
+#: build/trans_presets.java:2704
 msgid "Volcano"
 msgstr "Vulkan"
@@ -17086,70 +17428,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 "Ret vulkan"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2711
+#: build/trans_presets.java:2712
 msgid "Boundaries"
 msgstr "Grænser"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2713
 msgid "National"
 msgstr "National"
 
 #. item
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2714
 msgid "Edit National Boundary"
 msgstr "Ret landegrænser"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2718
+#: build/trans_presets.java:2719
 msgid "Administrative"
 msgstr "Administrativt"
 
 #. item
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2720
 msgid "Edit Administrative Boundary"
 msgstr "Ret administrativ grænse"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2724
+#: build/trans_presets.java:2725
 msgid "Civil"
 msgstr "Civil"
 
 #. item
-#: build/trans_presets.java:2725
+#: build/trans_presets.java:2726
 msgid "Edit Civil Boundary"
 msgstr "Ret civil-grænse"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2730
+#: build/trans_presets.java:2731
 msgid "Political"
 msgstr "Politisk"
 
 #. item
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:2732
 msgid "Edit Political Boundary"
 msgstr "Ret politisk grænse"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2736
+#: build/trans_presets.java:2737
 msgid "National park"
 msgstr "Nationalpark"
 
 #. item
-#: build/trans_presets.java:2737
+#: build/trans_presets.java:2738
 msgid "Edit National Park Boundary"
 msgstr "Ret grænser for nationalpark"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2744
 msgid "Land use"
 msgstr "Brug af land"
 
 #. group "Land use"
-#: build/trans_presets.java:2744
+#: build/trans_presets.java:2745
 msgid "Tree"
 msgstr "Træ"
@@ -17158,15 +17500,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 "Ret et træ"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2753
 msgid "Botanical Name"
 msgstr "Botanisk navn"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2755
 msgid "Wood"
 msgstr "Skov"
@@ -17175,5 +17517,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 "Ret skov"
@@ -17181,17 +17523,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 "Nåleskov"
 
-#: build/trans_presets.java:2760 build/trans_presets.java:2769
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
 msgid "deciduous"
 msgstr "Løvskov"
 
-#: build/trans_presets.java:2760 build/trans_presets.java:2769
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
 msgid "mixed"
 msgstr "blandet"
 
-#: build/trans_presets.java:2762
+#: build/trans_presets.java:2763
 msgid "Forest"
 msgstr "Skov"
@@ -17200,14 +17542,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 "Ret skovområde"
 
-#: build/trans_presets.java:2771
+#: build/trans_presets.java:2772
 msgid "Nature Reserve"
 msgstr "Naturreservat"
 
 #. item
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2773
 msgid "Edit Nature Reserve"
 msgstr "Ret naturreservat"
@@ -17215,25 +17557,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2777
+#: build/trans_presets.java:2778
 msgid "Scree"
 msgstr "Ur"
 
 #. item
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:2779
 msgid "Edit Scree"
 msgstr "Ret ur"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2783
 msgid "Scrub"
 msgstr "Krat"
 
 #. item
-#: build/trans_presets.java:2783
+#: build/trans_presets.java:2784
 msgid "Edit Scrub"
 msgstr "Ret krat"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2788
 msgid "Fell"
 msgstr "Højdedrag"
@@ -17241,10 +17583,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 "Ret højdedrag"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2794
 msgid "Heath"
 msgstr "Hede"
@@ -17252,5 +17594,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 "Ret hede"
@@ -17258,5 +17600,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2801
 msgid "Farmyard"
 msgstr "Gårdsplads"
@@ -17265,45 +17607,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 "Ret gårdsplads"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2808
+#: build/trans_presets.java:2809
 msgid "Farmland"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2810
 msgid "Edit Farmland Landuse"
 msgstr ""
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2814
+#: build/trans_presets.java:2815
 msgid "Meadow"
 msgstr "Eng"
 
 #. item
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2816
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2820
+#: build/trans_presets.java:2821
 msgid "Vineyard"
 msgstr "Vingård"
 
 #. item
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2822
 msgid "Edit Vineyard Landuse"
 msgstr "Ret vingård"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2826
+#: build/trans_presets.java:2827
 msgid "Allotments"
 msgstr "Kolonihaver"
 
 #. item
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:2828
 msgid "Edit Allotments Landuse"
 msgstr "Ret kolonihave-område"
@@ -17311,25 +17653,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2833
+#: build/trans_presets.java:2834
 msgid "Garden"
 msgstr "Have"
 
 #. item
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2835
 msgid "Edit Garden"
 msgstr "Ret have"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2838
+#: build/trans_presets.java:2839
 msgid "Grass"
 msgstr "Græs"
 
 #. item
-#: build/trans_presets.java:2839
+#: build/trans_presets.java:2840
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2845
 msgid "Village Green"
 msgstr ""
@@ -17337,10 +17679,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 ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:2852
 msgid "Common"
 msgstr ""
@@ -17348,20 +17690,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 ""
 
 #. 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 "Ret park"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2863
 msgid "Recreation Ground"
 msgstr "Rekreativt område"
@@ -17369,5 +17711,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 "Ret rekreativt område"
@@ -17375,15 +17717,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2871
 msgid "Residential area"
 msgstr "Beboelseområde"
 
 #. item
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2872
 msgid "Edit Residential Landuse"
 msgstr ""
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2877
 msgid "Graveyard"
 msgstr "Kirkegård"
@@ -17391,9 +17733,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 "Ret kirkegård"
 
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:2885
 msgid "Cemetery"
 msgstr "Kirkegård"
@@ -17401,39 +17743,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 "Ret kirkegård"
 
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2894
 msgid "Retail"
 msgstr "Detailhandel"
 
 #. item
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2895
 msgid "Edit Retail Landuse"
 msgstr "Ret område for detailhandel"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2900
 msgid "Commercial"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2901
 msgid "Edit Commercial Landuse"
 msgstr ""
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2906
 msgid "Industrial"
 msgstr "Industri"
 
 #. item
-#: build/trans_presets.java:2906
+#: build/trans_presets.java:2907
 msgid "Edit Industrial Landuse"
 msgstr "Ret industri-område"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2912
 msgid "Railway land"
 msgstr ""
@@ -17441,15 +17783,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 ""
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:2919
 msgid "Military"
 msgstr "Militært område"
 
 #. item
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2920
 msgid "Edit Military Landuse"
 msgstr "Ret militært område"
@@ -17457,55 +17799,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2925
+#: build/trans_presets.java:2926
 msgid "Construction area"
 msgstr "Byggeplads"
 
 #. item
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2927
 msgid "Edit Construction Landuse"
 msgstr "Ret område for byggeplads"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2932
 msgid "Brownfield"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:2933
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2937
+#: build/trans_presets.java:2938
 msgid "Greenfield"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:2939
 msgid "Edit Greenfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:2944
 msgid "Landfill"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:2945
 msgid "Edit Landfill Landuse"
 msgstr ""
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2950
 msgid "Quarry"
 msgstr "Stenbrud"
 
 #. item
-#: build/trans_presets.java:2950
+#: build/trans_presets.java:2951
 msgid "Edit Quarry Landuse"
 msgstr "Ret stenbrudsområde"
 
 #. group "Relations"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2960
 msgid "Multipolygon"
 msgstr "Multipolygon"
@@ -17515,5 +17857,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 "Ret multipolygon"
@@ -17522,10 +17864,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:2970
 msgid "outer segment"
 msgstr "ydre segment"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:2970
+#: build/trans_presets.java:2971
 msgid "inner segment"
 msgstr "indre segment"
@@ -17533,5 +17875,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:2974
 msgid "Turn restriction"
 msgstr ""
@@ -17540,5 +17882,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 ""
@@ -17546,34 +17888,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 ""
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_straight_on"
 msgstr ""
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_u_turn"
 msgstr ""
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "only_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "only_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "only_straight_on"
 msgstr ""
@@ -17582,15 +17924,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2983
+#: build/trans_presets.java:2984
 msgid "from way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2985
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2986
 msgid "to way"
 msgstr ""
@@ -17598,5 +17940,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:2988
+#: build/trans_presets.java:2989
 msgid "Route"
 msgstr ""
@@ -17605,5 +17947,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 ""
@@ -17611,5 +17953,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 ""
@@ -17681,5 +18023,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
@@ -17688,17 +18030,17 @@
 msgstr "cykel"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "bus"
 msgstr "bus"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "road"
 msgstr "vej"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "ferry"
 msgstr "færge"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "ski"
 msgstr "ski"
@@ -17751,5 +18093,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
@@ -17758,13 +18100,13 @@
 msgstr "fod"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "hiking"
 msgstr "vandre"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "detour"
 msgstr "omvej"
@@ -17778,10 +18120,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 "undergrundsbane"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:2997
 msgid "Symbol description"
 msgstr "Symbol beskrivelse"
@@ -17789,26 +18131,26 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:2999
+#: build/trans_presets.java:3000
 msgid "Network"
 msgstr "Netværk"
 
 #. item "Relations/Route" combo "State"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "proposed"
 msgstr "foreslået"
 
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "temporary"
 msgstr "midlertidig"
 
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "connection"
 msgstr "forbindelse"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3003
 msgid "Color (hex)"
 msgstr ""
@@ -17817,30 +18159,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:3006
 msgid "route segment"
 msgstr "rute-segment"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3007
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3008
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3009
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3010
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3011
 msgid "backward halt point"
 msgstr ""
@@ -21955,7 +22297,20 @@
 msgstr ""
 
+#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
+#~ msgstr ""
+#~ "Du kan bruge musen eller Ctrl+piletaster/./ for at zoome og panorere."
+
 #~ msgid "Uploading data"
 #~ msgstr "Sender data"
 
+#~ msgid "Email"
+#~ msgstr "E-mail"
+
+#~ msgid "Login name (email) to the OSM account."
+#~ msgstr "Login-navn (e-mail) til OSM-kontoen."
+
+#~ msgid "OSM username (email)"
+#~ msgstr "OSM-brugernavn (e-mail)"
+
 #~ msgid "Unknown host"
 #~ msgstr "Ukendt vært"
@@ -21963,4 +22318,11 @@
 #~ msgid "Add either site-josm.xml or Wiki Pages."
 #~ msgstr "Tilføj enten site-josm.xml eller Wiki-sider."
+
+#~ msgid ""
+#~ "Server returned internal error. Try a reduced area or retry after waiting "
+#~ "some time."
+#~ msgstr ""
+#~ "Serveren returnerede en intern fejl. Prøv med et mindre område eller prøv "
+#~ "igen om kort tid."
 
 #~ msgid "Commit comment"
@@ -22008,6 +22370,66 @@
 #~ msgstr "Vil du virkelig markere denne fejlrapport som \"udført\"?"
 
+#~ 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 URL.<br><b>Do not use a valuable Password.</b></html>"
+#~ msgstr ""
+#~ "<html>ADVARSEL: Kodeordet er gemt i klar tekst.<br>Det bliver sendt i "
+#~ "klar tekst til serveren, integreret i URLen.<br><br>Brug ikke et "
+#~ "værdifuldt kodeord.</b></html>"
+
 #~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS"
 #~ msgstr "Hent korrigeret billede fra Metacartas Map Recitifier WMS"
+
+#~ msgid ""
+#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab "
+#~ "- these will then show up in the WMS menu.\n"
+#~ "\n"
+#~ "You can also do this manually in the Advanced Preferences, using the "
+#~ "following schema:\n"
+#~ "wmsplugin.url.1.name=Landsat\n"
+#~ "wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n"
+#~ "wmsplugin.url.2.name=NPE Maps... etc\n"
+#~ "\n"
+#~ "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"
+#~ "\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"
+#~ "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"
+#~ "Note: Make sure the image is suitable, copyright-wise, if in doubt, don't "
+#~ "use."
+#~ msgstr ""
+#~ "Du kan tilføje, rette og slette WMS-enheder i WMSudvidelses-"
+#~ "indstillingsfanebladet - de vil derefter blive vist i WMS-menuen.\n"
+#~ "\n"
+#~ "Du kan også rette dette manuelt i avancerede indstillinger ved at bruge "
+#~ "følgende notation:\n"
+#~ "wmsplugin.url.1.name=Landsat\n"
+#~ "wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n"
+#~ "wmsplugin.url.2.name=NPE Maps... etc\n"
+#~ "\n"
+#~ "Eksempel på fuld WMS URL-inputformat (landsat)\n"
+#~ "http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n"
+#~ "layers=global_mosaic&styles=&srs=EPSG:4326&\n"
+#~ "format=image/jpeg \n"
+#~ "\n"
+#~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/  skal "
+#~ "du kun bruge det relevante 'id' som input..\n"
+#~ "Vil du tilføje et Metacarta Map Rectifier-menupunkt manuelt, opret da en "
+#~ "URL manuelt som i dette eksempel, hvor du erstatter 63 med dit billede-"
+#~ "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"
+#~ "Bemærk: Vær sikker på at billedet er hensigtsmæssigt at bruge ud fra "
+#~ "ophavsretsmæssige betragtninger. Er du i tvivl, så undlad at bruge "
+#~ "billedet."
 
 #~ msgid "Portcullis"
@@ -22033,7 +22455,20 @@
 #~ msgstr "viadukt"
 
+#~ msgid "Open the OpenStreetBugs window and activate the automatic download"
+#~ msgstr "Åbner OpenStreetBugs-vinduet og aktiverer den automatiske download"
+
 #~ msgid "Delete and Download"
 #~ msgstr "Slet og hent"
 
+#~ msgid ""
+#~ "This action will require {0} individual download requests. Do you wish to "
+#~ "continue?"
+#~ msgstr ""
+#~ "Denne handling kræver {0} individuelle download-anmodninger. Vil du "
+#~ "fortsætte?"
+
+#~ msgid "The following errors occured during mass download:"
+#~ msgstr "Følgende fejl opstod under den samlede download:"
+
 #~ msgid "Edit Drawbridge"
 #~ msgstr "Ret en vindebro"
@@ -22041,2 +22476,12 @@
 #~ msgid "Edit Portcullis"
 #~ msgstr "Ret et faldgitter"
+
+#~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">english</A>."
+#~ msgstr "Hjælpesiden mangler. Opret den på <a href=\"{0}\"engelsk</a>."
+
+#~ msgid ""
+#~ "Helppage missing. Create it in <A HREF=\"{0}\">english</A> or <A HREF="
+#~ "\"{1}\">your language</A>."
+#~ msgstr ""
+#~ "Hjælpesiden mangler. Opret den på <a href=\"{0}\"engelsk</a>. eller i <a "
+#~ "href=\"{1}\">dit eget sprog</a>."
Index: applications/editors/josm/i18n/po/de.po
===================================================================
--- applications/editors/josm/i18n/po/de.po	(revision 16008)
+++ applications/editors/josm/i18n/po/de.po	(revision 16009)
@@ -1,3 +1,2 @@
-# translation of de.po to Deutsch
 # translation of de.po to
 #
@@ -9,13 +8,13 @@
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-14 16:51+0200\n"
-"PO-Revision-Date: 2009-06-14 09:33+0000\n"
+"POT-Creation-Date: 2009-06-19 21:52+0200\n"
+"PO-Revision-Date: 2009-06-19 19:23+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
-"Language-Team: Deutsch\n"
+"Language-Team: <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-06-14 14:46+0000\n"
+"X-Launchpad-Export-Date: 2009-06-19 19:34+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -28,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 "Hilfe"
 
 #: ../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 ""
 "Die Projektion kann nicht aus den Einstellungen ermittelt werden. Verwende "
@@ -74,6 +73,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
@@ -90,8 +91,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
@@ -140,5 +141,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"
@@ -190,5 +191,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
 msgid "Contribution"
-msgstr "Mitwirkung"
+msgstr "Mitwirkende"
 
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
@@ -541,5 +542,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}"
@@ -611,5 +612,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:92
-msgid "Email"
+msgid "E-Mail"
 msgstr "E-Mail"
 
@@ -648,12 +649,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
@@ -680,5 +683,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
@@ -711,5 +714,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:207
 #, java-format
-msgid "Helppage missing. Create it in <A HREF=\"{0}\">english</A>."
+msgid "Help page missing. Create it in <A HREF=\"{0}\">english</A>."
 msgstr "Hilfeseite fehlt. In <A HREF=\"{0}\">englischer</A> Sprache erstellen."
 
@@ -717,5 +720,5 @@
 #, 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 ""
@@ -1153,13 +1156,13 @@
 msgstr "Hilfe: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:99
 msgid "Status Report"
 msgstr "Statusbericht"
 
-#: ../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 "In die Zwischenablage kopieren und schließen"
 
-#: ../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
@@ -1365,17 +1368,15 @@
 msgstr "Nichts auswählen (Escape)"
 
-#: ../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 "Daten aktualisieren"
 
-#: ../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 ""
 "Die aktuelle Datenebene mittels des Servers aktualisieren (neu herunterladen)"
 
-#: ../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?"
@@ -1384,97 +1385,258 @@
 "heruntergeladen oder geöffnet?"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:70
+msgid "Undeleting Way..."
+msgstr "Weg wiederherstellen..."
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:133
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:247
+msgid "Yes, undelete them too"
+msgstr "Ja, auch wiederherstellen"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:248
+msgid "No, cancel operation"
+msgstr "Nein, Operation abbrechen"
+
+#: ../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 ""
-"Diese Aktion benötigt {0} individuelle Serverzugriffe. Wollen Sie fortfahren?"
-
-#: ../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 "Zusätzliche Knoten wiederherstellen?"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:170
+#, java-format
+msgid "Checking whether node {0} is gone ..."
+msgstr "Prüfe ob Knoten {0} gelöscht wurde..."
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:203
+msgid "Undeleting relation..."
+msgstr "Relation wiederherstellen..."
+
+#: ../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 "Abhängige Objekte wiederherstellen?"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:284
+#, java-format
+msgid "Checking whether primitive {0} is gone ..."
+msgstr "Prüfe ob Objekt {0} gelöscht wurde..."
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:339
+msgid "Keep mine"
+msgstr "Meine behalten"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:340
+msgid "Delete mine"
+msgstr "Meine löschen"
+
+#: ../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 "Objekt auf Server gelöscht"
+
+#. 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 "Unerwarteter Rückgabewert: {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:395
+msgid "Failed to update the selected primitives."
+msgstr "Fehler beim Hochladen der gewählten Objekte"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:396
+msgid "Update failed"
+msgstr "Aktualisierung fehlgeschlagen"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:408
+#, java-format
+msgid "Could not find primitive with id {0} in the current dataset"
+msgstr "Konnte Objekt mit ID {0} im aktuellen Datensatz nicht finden"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:409
+msgid "Missing primitive"
+msgstr "Objekt fehlt"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:441
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:445
+msgid "Update Selection"
+msgstr "Auswahl aktualisieren"
+
+#: ../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 "Auswahl leer"
+
+#: ../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 "Auswahl zu groß"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
 msgid "Upload to OSM..."
 msgstr "Zum OSM-Server hochladen..."
 
-#: ../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 "Alle Änderungen zum OSM-Server hochladen."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:96
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:94
 msgid "Objects to add:"
 msgstr "Neue Objekte:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102
 msgid "Objects to modify:"
 msgstr "Geänderte Objekte:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:110
 msgid "Objects to delete:"
 msgstr "Zu löschende Objekte:"
 
-#: ../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 "Angabe eines kurzen Kommentars über die hochzuladenden Änderungen:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:126
 msgid "Upload these changes?"
 msgstr "Diese Änderungen hochladen?"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:130
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
 msgid "Upload Changes"
 msgstr "Änderungen hochladen"
 
-#: ../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 "Nichts geändert. Erfassen Sie erst einige Daten."
 
-#: ../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 "Es gibt ungelöste Konflikte, die zuerst aufgelöst werden müssen."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:182
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:180
 msgid "No changes to upload."
 msgstr "Keine Änderungen zum Hochladen vorhanden."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:203
 msgid "Uploading"
 msgstr "Hochladen"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:250
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
+msgid "Updating primitive"
+msgstr "Objekt aktualisieren"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:310
+#, java-format
+msgid "Synchronize {0} {1} only"
+msgstr "Nur {0} {1} synchronisieren"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:355
+msgid "Synchronize entire dataset"
+msgstr "Ganzen Datensatz synchronisieren"
+
+#: ../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 ""
-"<html>Hochladen <strong>fehlgeschlagen</strong>, da der Server eine neuere "
-"Version einer Ihrer<br>Knoten, Wege oder Relationen hat.<br>Der Konflikt "
-"wird von <strong>{0}</strong> mit ID <strong>{1}</strong> verursacht,<br>der "
-"Server hat Version {2}, Ihre Version ist {3}.<br>Bitte synchronisieren Sie "
-"Ihren lokalen Datensatz mittels <br><strong>Datei-&gt;Daten aktualisieren</"
-"strong>, lösen<br>alle Konflikte und versuchen das Hochladen erneut.</html>"
-
-#: ../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 "Konflikt festgestellt"
+
+#: ../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 ""
-"<html>Hochladen fehlgeschlagen, da der Server eine neuere Version einer "
-"Ihrer<br>Knoten, Wege oder Relationen hat.<br>Bitte synchronisieren Sie "
-"Ihren lokalen Datensatz mittels <br><strong>Datei-&gt;Daten aktualisieren</"
-"strong>, lösen<br>alle Konflikte und versuchen das Hochladen erneut.</html>"
-
-#: ../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 "Hochladen zu OSM-API fehlgeschlagen"
 
-#: ../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 ""
@@ -1581,37 +1743,51 @@
 msgstr "Rohe GPS-Daten"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:44
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:46
 msgid "Downloading data"
 msgstr "Daten herunterladen"
 
-#: ../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 "Keine Daten importiert."
 
-#: ../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 "Datenebene {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 "OpenStreetMap-Daten"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:37
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:45
 msgid "Data Layer"
 msgstr "Datenebene"
 
-#: ../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 "{0} von {1} herunterladen (noch {2})"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:88
-msgid "The following errors occured during mass download:"
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:95
+msgid "The following errors occurred during mass download:"
 msgstr "Die folgenden Fehler sind während des Herunterladens aufgetreten:"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:89
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:96
 msgid "Errors during Download"
 msgstr "Fehler beim Herunterladen"
+
+#: ../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
@@ -1664,34 +1840,34 @@
 msgstr "Kann keinen Knoten außerhalb der Welt erstellen."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:495
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:493
 msgid "Add node"
 msgstr "Knotenpunkt hinzufügen"
 
-#: ../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 "Knotenpunkt in einen Weg einfügen"
 
-#: ../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 "Existierenden Weg mit Knotenpunkt verbinden"
 
-#: ../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 "Einen Knotenpunkt in einen bestehenden Weg einfügen"
 
-#: ../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 "Knotenpunkt in einen Weg einfügen und verbinden"
 
-#: ../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 "Einen neuen Knoten erstellen."
 
-#: ../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 "Knoten unter Mauszeiger wählen."
 
-#: ../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."
@@ -1700,14 +1876,14 @@
 msgstr[1] "Neuen Knoten in {0} Wege einfügen."
 
-#: ../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 "Neuen Weg an letztem Knoten beginnen."
 
-#: ../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 "Weg am letzten Knoten fortsetzen."
 
-#: ../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 "Zeichnen beenden."
@@ -2045,26 +2221,32 @@
 msgstr "Ungültiger Wert für ID-Operator: {0}. Zahl erwartet."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:33
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:34
 msgid "Load Selection"
 msgstr "Auswahl laden"
 
-#: ../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 "Verbinden zu {0}..."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:45
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:46
 msgid "Downloading..."
 msgstr "Daten werden geladen..."
 
-#: ../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 "Konnte nicht von der URL \"{0}\" lesen"
 
-#: ../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 "URL \"{0}\" kann nicht interpretiert werden."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:74
+msgid "Error while communicating with server."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67
@@ -2125,13 +2307,85 @@
 msgstr "{0} Konflikte in {1} Objekten auflösen"
 
-#: ../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 "Koordinatenkonflikte für {0} auflösen"
+
+#. 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 "Kann unentschiedenen Konflikt nicht auflösen"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81
+#, java-format
+msgid "Delete {1} {0}"
+msgstr "{1} {0} löschen"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97
+#, java-format
+msgid "Delete {0} {1}"
+msgstr "{0} {1} löschen"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153
+msgid "Conflicting relation"
+msgstr "Konflikt mit Relation"
+
+#: ../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 ""
+"Auswahl \"{0}\" wird mit Rolle {2} in Relation \"{1}\" verwendet.\n"
+"Aus Relation entfernen?"
+
+#: ../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 "Aus der Relation entfernen"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
+#, java-format
+msgid ""
+"Selection \"{0}\" is used by relation \"{1}\".\n"
+"Delete from relation?"
+msgstr ""
+"Auswahl \"{0}\" wird in Relation \"{1}\" verwendet.\n"
+"Aus Relation entfernen?"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:366
+msgid "Split way segment"
+msgstr "Wegabschnitt aufspalten"
+
+#. 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 ""
+"Sie sind dabei Knoten außerhalb des heruntergeladenen Bereichs zu löschen."
+"<br>Das kann zu Problemen führen, wenn andere Objekte (die Sie nicht sehen) "
+"diese verwenden.<br>Wollen Sie die Knoten wirklich löschen?"
+
+#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:53
+#, java-format
+msgid "Resolve conflicts in deleted state in {0}"
+msgstr "Konflikte im Löschstatus für {0} auflösen"
+
+#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118
+msgid "Move"
+msgstr "Verschieben"
+
 #: ../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"
@@ -2140,10 +2394,219 @@
 msgstr[1] "Knotenpunkte"
 
-#: ../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 "Konflikte in der Elementenliste für Relation {0} auflösen"
+
+#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66
+msgid "RemoveRelationMember"
+msgstr "EntferneRelationsElement"
+
+#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
+msgid "Rotate"
+msgstr "Drehen"
+
+#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88
+msgid "Sequence"
+msgstr "Abfolge"
+
+#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:72
+#, java-format
+msgid "Resolve {0} tag conflicts in {1} {2}"
+msgstr "{0} Merkmalskonflikte für {1} {2} auflösen"
+
+#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:61
+#, java-format
+msgid "Undelete {0} primitives"
+msgstr "{0} Objekte wiederherstellen"
+
+#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:44
+#, java-format
+msgid "Resolve version conflicts for {0} {1}"
+msgstr "Versionskonflikt für {0} {1} auflösen"
+
+#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52
+#, java-format
+msgid "Resolve conflicts in node list of of way {0}"
+msgstr "Konflikte in Knotenliste des Weges {0} auflösen"
+
+#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
+msgid "Apply?"
+msgstr "Anwenden?"
+
+#: ../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 ""
+"Für das Umdrehen des Weges werden zum Erhalt der Datenintegrität folgende "
+"Eigenschaftsänderungen am Weg und seinen Knoten vorgeschlagen."
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28
+msgid "Relation"
+msgstr "Relation"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30
+msgid "Old role"
+msgstr "Alter Rolle"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:32
+msgid "New role"
+msgstr "Neue Rolle"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
+msgid "Old key"
+msgstr "Alter Schlüssel"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
+msgid "Old value"
+msgstr "Alter Wert"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
+msgid "New key"
+msgstr "Neuer Schlüssel"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
+msgid "New value"
+msgstr "Neuer Wert"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:40
+msgid "Apply selected changes"
+msgstr "Ausgewählte Änderungen anwenden"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41
+msgid "Don't apply changes"
+msgstr "Änderungen nicht anbringen"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:83
+msgid "Please select which property changes you want to apply."
+msgstr "Bitte wählen Sie welche, Objekteigenschaften geändert werden sollen."
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:96
+msgid "Properties of "
+msgstr "Eigenschaften von "
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:120
+msgid "Roles in relations referring to"
+msgstr "Rollen in Relationen beziehen sich auf"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:136
+msgid "Automatic tag correction"
+msgstr "Automatische Merkmalskorrektur"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:314
+#, java-format
+msgid "Malformed config file at lines {0}"
+msgstr "Ungültige Einstellungen in den Zeilen {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:324
+#, java-format
+msgid "Cannot open preferences directory: {0}"
+msgstr "Kann Einstellungsverzeichnis nicht laden: {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 "Einstellungsdate enthält Fehler. Erstelle eine Sicherung unter {0}."
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:79
+#, java-format
+msgid "Preferences stored on {0}"
+msgstr "Einstellungen auf {0} gespeichert"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:82
+#, java-format
+msgid "Could not upload preferences. Reason: {0}"
+msgstr "Kann keine Einstellungen zum Server laden. Grund: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:93
+msgid "Could not load preferences from server."
+msgstr "Kann keine Einstellungen vom Server laden."
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:34
+msgid "different"
+msgstr "unterschiedlich"
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:262
+msgid "deleted"
+msgstr "gelöscht"
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
+msgid "true"
+msgstr "wahr"
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
+msgid "false"
+msgstr "falsch"
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20
+msgid "position"
+msgstr "Position"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30
+msgid "Decimal Degrees"
+msgstr "Dezimalgrad"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
+msgid "Degrees Minutes Seconds"
+msgstr "Grad Minuten Sekunden"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+msgid "S"
+msgstr "S"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+msgid "N"
+msgstr "N"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+msgid "W"
+msgstr "W"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+msgid "E"
+msgstr "O"
+
+#: ../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 "unvollständig"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
+#, java-format
+msgid "Error: {0}"
+msgstr "Fehler: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
+#, java-format
+msgid "Warning: {0}"
+msgstr "Warnung: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7
+msgid "nodes"
+msgstr "Knotenpunkte"
+
+#: ../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"
@@ -2152,8 +2615,10 @@
 msgstr[1] "Wege"
 
-#: ../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 "Wege"
+
+#: ../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
@@ -2164,265 +2629,27 @@
 msgstr[1] "Relationen"
 
-#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:68
-#, java-format
-msgid "Resolve conflicts in coordinates in {0}"
-msgstr "Koordinatenkonflikte für {0} auflösen"
-
-#. 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 "Kann unentschiedenen Konflikt nicht auflösen"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81
-#, java-format
-msgid "Delete {1} {0}"
-msgstr "{1} {0} löschen"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97
-#, java-format
-msgid "Delete {0} {1}"
-msgstr "{0} {1} löschen"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153
-msgid "Conflicting relation"
-msgstr "Konflikt mit Relation"
-
-#: ../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 ""
-"Auswahl \"{0}\" wird mit Rolle {2} in Relation \"{1}\" verwendet.\n"
-"Aus Relation entfernen?"
-
-#: ../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 "Aus der Relation entfernen"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
-#, java-format
-msgid ""
-"Selection \"{0}\" is used by relation \"{1}\".\n"
-"Delete from relation?"
-msgstr ""
-"Auswahl \"{0}\" wird in Relation \"{1}\" verwendet.\n"
-"Aus Relation entfernen?"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:366
-msgid "Split way segment"
-msgstr "Wegabschnitt aufspalten"
-
-#. 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 ""
-"Sie sind dabei Knoten außerhalb des heruntergeladenen Bereichs zu löschen."
-"<br>Das kann zu Problemen führen, wenn andere Objekte (die Sie nicht sehen) "
-"diese verwenden.<br>Wollen Sie die Knoten wirklich löschen?"
-
-#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:53
-#, java-format
-msgid "Resolve conflicts in deleted state in {0}"
-msgstr "Konflikte im Löschstatus für {0} auflösen"
-
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118
-msgid "Move"
-msgstr "Verschieben"
-
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:52
-#, java-format
-msgid "Resolve conflicts in member list of of relation {0}"
-msgstr "Konflikte in der Elementenliste für Relation {0} auflösen"
-
-#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66
-msgid "RemoveRelationMember"
-msgstr "EntferneRelationsElement"
-
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
-msgid "Rotate"
-msgstr "Drehen"
-
-#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88
-msgid "Sequence"
-msgstr "Abfolge"
-
-#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:84
-#, java-format
-msgid "Resolve {0} tag conflicts in {1} {2}"
-msgstr "{0} Merkmalskonflikte für {1} {2} auflösen"
-
-#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:57
-#, java-format
-msgid "Resolve version conflicts for {0} {1}"
-msgstr "Versionskonflikt für {0} {1} auflösen"
-
-#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52
-#, java-format
-msgid "Resolve conflicts in node list of of way {0}"
-msgstr "Konflikte in Knotenliste des Weges {0} auflösen"
-
-#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
-msgid "Apply?"
-msgstr "Anwenden?"
-
-#: ../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 ""
-"Für das Umdrehen des Weges werden zum Erhalt der Datenintegrität folgende "
-"Eigenschaftsänderungen am Weg und seinen Knoten vorgeschlagen."
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28
-msgid "Relation"
-msgstr "Relation"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30
-msgid "Old role"
-msgstr "Alter Rolle"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:32
-msgid "New role"
-msgstr "Neue Rolle"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
-msgid "Old key"
-msgstr "Alter Schlüssel"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
-msgid "Old value"
-msgstr "Alter Wert"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
-msgid "New key"
-msgstr "Neuer Schlüssel"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
-msgid "New value"
-msgstr "Neuer Wert"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:40
-msgid "Apply selected changes"
-msgstr "Ausgewählte Änderungen anwenden"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41
-msgid "Don't apply changes"
-msgstr "Änderungen nicht anbringen"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:83
-msgid "Please select which property changes you want to apply."
-msgstr "Bitte wählen Sie welche, Objekteigenschaften geändert werden sollen."
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:96
-msgid "Properties of "
-msgstr "Eigenschaften von "
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:120
-msgid "Roles in relations referring to"
-msgstr "Rollen in Relationen beziehen sich auf"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:136
-msgid "Automatic tag correction"
-msgstr "Automatische Merkmalskorrektur"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:314
-#, java-format
-msgid "Malformed config file at lines {0}"
-msgstr "Ungültige Einstellungen in den Zeilen {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:324
-#, java-format
-msgid "Cannot open preferences directory: {0}"
-msgstr "Kann Einstellungsverzeichnis nicht laden: {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 "Einstellungsdate enthält Fehler. Erstelle eine Sicherung unter {0}."
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:79
-#, java-format
-msgid "Preferences stored on {0}"
-msgstr "Einstellungen auf {0} gespeichert"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:82
-#, java-format
-msgid "Could not upload preferences. Reason: {0}"
-msgstr "Kann keine Einstellungen zum Server laden. Grund: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:93
-msgid "Could not load preferences from server."
-msgstr "Kann keine Einstellungen vom Server laden."
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:34
-msgid "different"
-msgstr "unterschiedlich"
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:262
-msgid "deleted"
-msgstr "gelöscht"
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
-msgid "true"
-msgstr "wahr"
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
-msgid "false"
-msgstr "falsch"
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20
-msgid "position"
-msgstr "Position"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30
-msgid "Decimal Degrees"
-msgstr "Dezimalgrad"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
-msgid "Degrees Minutes Seconds"
-msgstr "Grad Minuten Sekunden"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
-msgid "S"
-msgstr "S"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
-msgid "N"
-msgstr "N"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
-msgid "W"
-msgstr "W"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
-msgid "E"
-msgstr "O"
-
-#: ../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 "unvollständig"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
-#, java-format
-msgid "Error: {0}"
-msgstr "Fehler: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
-#, java-format
-msgid "Warning: {0}"
-msgstr "Warnung: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:101
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9
+msgid "relations"
+msgstr "Relationen"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10
+msgid "changeset"
+msgstr "Änderungssatz"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10
+msgid "changesets"
+msgstr "Änderungsätze"
+
+#: ../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"
@@ -2436,5 +2663,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:122
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "railway"
 msgstr "Eisenbahn"
@@ -2456,4 +2683,62 @@
 msgstr[1] "{0} Knoten"
 
+#: ../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 "Parameter \"{0}\" darf nicht NULL sein"
+
+#: ../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 "Parameter {0} außerhalb des Bereichs 0..{1}: Wert ist {2}"
+
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:234
 msgid "Area style way is not closed."
@@ -2601,5 +2886,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 "Hintergrund"
@@ -2688,8 +2973,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
@@ -2701,7 +2986,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
@@ -2810,10 +3095,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 "Benutzername"
 
 #: ../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 "Passwort"
@@ -2912,22 +3197,22 @@
 msgstr "Einstellung {0} wird nicht länger benutzt und wurde deshalb entfernt."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:146
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148
 msgid "File"
 msgstr "Datei"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150
 msgid "View"
 msgstr "Ansicht"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:149
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151
 msgid "Tools"
 msgstr "Werkzeuge"
 
-#: ../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 "Vorlagen"
 
-#: ../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
@@ -2940,21 +3225,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 "Drahtdarstellung"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:218
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221
 msgid "Toggle Wireframe view"
 msgstr "Drahtdarstellung umschalten"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:244
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:247
 msgid "Full Screen"
 msgstr "Vollbild"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:246
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:249
 msgid "Toggle Full Screen view"
 msgstr "Vollbilddarstellung umschalten"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:286
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:289
 msgid "Audio"
 msgstr "Audio"
@@ -3026,6 +3311,6 @@
 msgstr "(kein Objekt)"
 
-#: ../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 "Ebene nicht in der Liste."
@@ -3035,9 +3320,9 @@
 msgstr "OSM-Server kontaktieren..."
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:104
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:105
 msgid "Error while parsing"
 msgstr "Fehler beim Einlesen"
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:107
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:108
 msgid "File not found"
 msgstr "Datei nicht gefunden"
@@ -3111,5 +3396,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 "Mitglieder"
@@ -3324,5 +3609,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
@@ -3406,5 +3691,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 "Parameter \"{0}\" darf nicht NULL sein."
@@ -3447,6 +3732,6 @@
 msgid ""
 "Properties in the merged element. They will replace properties in my "
-"elements when  merge decisions are applied."
-msgstr "Vereinigte Merkmale werden die lokalen nach der Übernahme ersetzen."
+"elements when merge decisions are applied."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88
@@ -3499,5 +3784,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 "Rolle"
@@ -3603,5 +3888,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
@@ -3918,5 +4203,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 "Relationen"
@@ -4025,66 +4310,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 "Änderungen übernehmen"
 
-#: ../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 "Standard"
 
-#: ../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 "Belegt durch"
 
-#: ../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 "verbunden"
 
-#: ../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 "Merkmale (leerer Wert löscht das Merkmal)"
 
-#: ../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 "Nach oben"
 
-#: ../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 "Ausgewählte Mitglieder nach oben schieben"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240
+msgstr "Ausgewählte Elemente nach oben schieben"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:246
 msgid "Add Selected"
 msgstr "Ausgewähltes hinzufügen"
 
-#: ../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 "Alle ausgewählten Objekte als Elemente hinzufügen"
 
-#: ../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 "Ausgewähltes entfernen"
 
-#: ../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 "Alle ausgewählten Objekte aus der Relation entfernen"
 
-#: ../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 "Nach unten"
 
-#: ../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 "Ausgewählte Elemente nach unten schieben"
 
-#: ../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 "Elemente in der gewählten Tabellenzeile aus dieser Relation entfernen."
 
-#: ../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 "Elemente herunterladen"
 
-#: ../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 "Alle nicht vollständigen Wege und Knoten der Relation herunterladen."
@@ -4129,5 +4414,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
@@ -4148,9 +4433,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 "ja"
 
-#: ../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
@@ -4172,31 +4457,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 "nein"
 
-#: ../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 "Mitglieder: {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 "Relationseditor: {0}"
 
-#: ../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 "Es sind Konflikte beim Importieren aufgetreten."
 
-#: ../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 "Fehler beim Parsen der Serverantwort."
 
-#: ../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 "Kann nicht mit Server verbinden."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:562
+msgid "Error when communicating with server."
+msgstr "Fehler bei der Kommunikation mit dem Server."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:67
@@ -4262,17 +4550,17 @@
 msgstr "Datenquellen und Typen"
 
-#: ../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 "Als neue Ebene laden"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:174
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:173
 msgid "Download Area"
 msgstr "Bereich laden"
 
-#: ../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 "Bereich zu groß, der Server wird das Laden wahrscheinlich verbieten"
 
-#: ../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 "Bereich korrekt, Größe ist wahrscheinlich akzeptabel für den Server"
@@ -4300,5 +4588,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 "Orte"
@@ -4345,21 +4633,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 "Typ"
@@ -4390,5 +4678,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:46
 msgid "to"
-msgstr "nach"
+msgstr "bis"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:44
@@ -4399,16 +4687,4 @@
 msgid "Tile Numbers"
 msgstr "Kachelnummern"
-
-#: ../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 ""
-"Sie können die Maus oder Strg+Pfeiltasten benutzen/./ um zu zoomen und zu "
-"verschieben."
-
-#. 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 "Karte"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:98
@@ -4487,5 +4763,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)"
@@ -4601,14 +4877,14 @@
 msgstr "Audio-Dateien im Wave-Format (*.wav)"
 
-#: ../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 "Audio-Marken von {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244
 msgid "Import images"
 msgstr "Bilder importieren"
 
-#: ../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, "
@@ -4617,5 +4893,5 @@
 msgstr[1] "{0} GPS-Spuren, "
 
-#: ../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, "
@@ -4624,5 +4900,5 @@
 msgstr[1] "{0} Routen, "
 
-#: ../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"
@@ -4631,28 +4907,28 @@
 msgstr[1] "{0} Wegpunkte"
 
-#: ../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 "Name: {0}"
 
-#: ../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 "Beschreibung: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347
 msgid "Timespan: "
 msgstr "Zeitspanne: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354
 msgid "Length: "
 msgstr "Länge: "
 
-#: ../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 "Zur Daten-Ebene konvertieren"
 
-#: ../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 ""
@@ -4663,11 +4939,11 @@
 "<br>Weitere Informationen, falls Sie die GPX-Spur hochladen möchten:"
 
-#: ../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
@@ -4677,29 +4953,29 @@
 msgstr "Konvertiert von: {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 "OSM-Daten entlang der GPS-Spur herunterladen"
 
-#: ../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 "Alles im Bereich herunterladen:"
 
-#: ../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 "{0} Meter"
 
-#: ../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 "Maximalgebiet je Anfrage:"
 
-#: ../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 "{0} km²"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:822
 #, java-format
 msgid ""
@@ -4710,5 +4986,5 @@
 "fortfahren?</html>"
 
-#: ../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 ""
@@ -4716,5 +4992,5 @@
 "werden kann."
 
-#: ../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 "
@@ -4724,5 +5000,5 @@
 "wurden ignoriert oder an den Anfang verschoben."
 
-#: ../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 "
@@ -4732,33 +5008,42 @@
 "der GPS-Spur entfernt waren, wurden ignoriert."
 
-#: ../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 "Außerhalb des heruntergeladenen Bereichs"
 
-#: ../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 "Version {0}"
 
-#: ../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 "Es traten {0} Konflikte während des Imports auf."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:388
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} besteht aus:"
 
-#: ../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} gelöscht.)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:371
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:396
 msgid "unset"
 msgstr "nicht angegeben"
 
-#: ../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 "API-Version: {0}"
 
-#: ../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"
@@ -4766,21 +5051,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"
@@ -4933,5 +5218,5 @@
 "Standardwert momentan unbekannt (Einstellung wurde noch nicht verwendet)."
 
-#: ../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
@@ -4940,5 +5225,5 @@
 msgstr "Bitte wählen Sie eine Zeile zum Bearbeiten."
 
-#: ../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
@@ -4946,5 +5231,5 @@
 msgstr "Neuer Wert für {0}"
 
-#: ../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
@@ -4954,5 +5239,5 @@
 msgstr "Bitte wählen Sie die zu löschende Zeile."
 
-#: ../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 "Ein neues Schlüssel/Wert-Paar hinzufügen."
@@ -5846,106 +6131,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 "Name"
@@ -6428,5 +6713,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 "Benutzername (E-Mail) für den OSM-Server."
 
@@ -6443,5 +6728,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
-msgid "OSM username (email)"
+msgid "OSM username (e-mail)"
 msgstr "OSM-Benutzername (E-Mail)"
 
@@ -6453,5 +6738,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 ""
@@ -6773,6 +7058,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 "Verbindung zum OSM-Server..."
@@ -6783,7 +7069,7 @@
 msgstr "Punkte {0} bis {1} werden heruntergeladen..."
 
-#: ../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 "OSM-Daten herunterladen..."
@@ -6848,15 +7134,14 @@
 msgstr "NMEA-Einlesen fehlgeschlagen!"
 
-#: ../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"
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81
+#, java-format
+msgid "preference ''{0}'' missing. Can't initialize OsmApi"
 msgstr "Einstellung {0} fehlt. Kann OsmApi nicht initialisieren."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:206
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:171
 msgid "This version of JOSM is incompatible with the configured server."
-msgstr "Diese JOSM-Version ist mit dem ein eingestellten Server inkompatibel."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:207
+msgstr "Diese JOSM-Version ist mit dem eingestellten Server inkompatibel."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172
 #, java-format
 msgid ""
@@ -6867,31 +7152,37 @@
 "bis {1} unterstützt."
 
-#: ../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 "Kommunikation mit {0} mittels Protokollversion {1} etabliert."
 
-#: ../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 "Kann keinen numerischen Wert aus der Antwort lesen"
-
-#: ../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 "Öffne Änderungssatz..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:351
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298
 msgid "Closing changeset..."
 msgstr "Schließe Änderungssatz..."
 
-#: ../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 "Kein Änderungssatz zum Hochladen vorhanden"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:376
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:321
 msgid "Preparing..."
 msgstr "Daten vorbereiten..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:381
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:326
 msgid "Uploading..."
 msgstr "Daten hochladen..."
@@ -6906,25 +7197,25 @@
 msgstr "Ungültige bz2-Datei."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:80
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:73
 msgid "Incorrect password or username."
 msgstr "Passwort oder Benutzername falsch."
 
-#: ../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 "Achtung: Das Passwort wird unverschlüsselt übertragen."
 
-#: ../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 "Benutzername und Passwort (unverschlüsselt) speichern"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:89
 msgid "Enter Password"
 msgstr "Passwort eingeben"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
 msgid "Login"
 msgstr "Anmelden"
 
-#: ../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..."
@@ -6935,4 +7226,58 @@
 msgstr "OSM-Server-Dateien (gzip-komprimiert)"
 
+#: ../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 "notwendiges Attribut \"{0}\" fehlt"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:74
+#, java-format
+msgid "illegal value for mandatory attribute ''{0}'' of type long, got ''{1}''"
+msgstr ""
+"ungültiger Wert \"{1}\" für notwendiges Attribut \"{0}\" vom Typ 64-Bit-"
+"Ganzzahl"
+
+#: ../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 ""
+"ungültiger Wert \"{1}\" für notwendiges Attribut \"{0}\" vom Typ positive 64-"
+"Bit-Ganzzahl (>=0)"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:91
+#, java-format
+msgid "illegal value for mandatory attribute ''{0}'' of type int, got ''{1}''"
+msgstr ""
+"ungültiger Wert \"{1}\" für notwendiges Attribut \"{0}\" vom Typ Ganzzahl"
+
+#: ../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 ""
+"ungültiger Wert \"{1}\" für notwendiges Attribut \"{0}\" vom Typ positive "
+"Ganzzahl"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:114
+#, java-format
+msgid ""
+"illegal value for mandatory attribute ''{0}'' of type boolean, got ''{1}''"
+msgstr ""
+"ungültiger Wert \"{1}\" für notwendiges Attribut \"{0}\" vom Typ "
+"Wahrheitswert"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:174
+#, java-format
+msgid ""
+"illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType, got "
+"''{1}''"
+msgstr ""
+"ungültiger Wert \"{1}\" für notwendiges Attribut \"{0}\" vom Typ "
+"OsmPrimitivTyp"
+
 #: ../core/src/org/openstreetmap/josm/io/OsmIdReader.java:38
 msgid "Error during parse."
@@ -7030,9 +7375,24 @@
 msgstr "Falsch formatierte Knoten-ID"
 
-#: ../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 ""
+"nichtnegativer Parameter \"{0}\" erwartet, stattdessen \"{1}\" erhalten"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:72
+msgid "Downloading history..."
+msgstr "Historie herunterladen..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:28
 msgid "Contacting Server..."
 msgstr "Serververbindung..."
 
-#: ../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."
@@ -7041,21 +7401,13 @@
 "Internetverbindung."
 
-#: ../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 ""
-"Der Server hat einen internen Fehler zurückgeliefert. Versuchen Sie einen "
-"kleineren Ausschnitt zu laden oder versuchen Sie es nach einiger Zeit erneut."
-
-#: ../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."
-msgstr ""
-"WARNUNG: Einstellung '{0}' oder API-Version {1} erfordern die Nutzung von "
-"Änderungssätzen, aber die API kann diese nicht verarbeiten. Änderungssätze "
-"werden ignoriert."
+"WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to "
+"use changesets, but API is not handle them. Ignoring changesets."
+msgstr ""
+"WARNUNG: Einstellung \"{0}\" oder API-Version \"{1}\" erfordern die Nutzung "
+"von Änderungssätzen, aber die API kann diese nicht verarbeiten. "
+"Änderungssätze werden ignoriert."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:134
@@ -7070,5 +7422,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 "Plugins herunterladen"
@@ -7261,9 +7613,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 "Fehlende Plugins herunterladen"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:128
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:119
 #, java-format
 msgid ""
@@ -7276,6 +7628,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
@@ -7298,35 +7650,35 @@
 msgstr "unbekannt"
 
-#: ../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}: Version {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 mit JOSM ausgeliefert"
 
-#: ../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 "Fehler beim Lesen der Plugin-Informationsdatei: {0}"
 
-#: ../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 "Ende der Aufzeichnung überschritten"
 
-#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:329
+#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:340
 msgid "Error playing sound"
 msgstr "Fehler bei der Klangausgabe"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
 msgid "Do nothing"
 msgstr "Keine Aktion"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
 msgid "Report Bug"
 msgstr "Programmfehler melden"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:52
 msgid ""
 "An unexpected exception occurred.\n"
@@ -7340,14 +7692,14 @@
 "von JOSM einsetzen, würden wir uns über einen Fehlerbericht freuen."
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55
 msgid "Unexpected Exception"
 msgstr "Unerwarteter Fehler"
 
-#: ../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 "Bitte melden Sie den Fehler unter {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 ""
@@ -7355,5 +7707,5 @@
 "notwendigen Schritte bei!"
 
-#: ../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 "
@@ -7363,9 +7715,9 @@
 "sowie aller Plugins, bevor Sie den Fehler melden."
 
-#: ../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 "Stellen Sie sicher, dass folgende Informationen enthalten sind:"
 
-#: ../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 "(Der Text wurde bereits in Ihre Zwischenablage kopiert.)"
@@ -7452,5 +7804,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 "Beschreibung"
@@ -7835,5 +8187,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 ""
@@ -7870,5 +8222,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"
@@ -7891,5 +8242,5 @@
 msgstr "Lambert-Zone 4 Zwischenspeicherdatei (.4)"
 
-#: ../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
@@ -7984,6 +8335,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/"
@@ -8073,6 +8424,6 @@
 msgstr "Merkmal  \"source=...\" zu Elementen hinzufügen?"
 
-#: ../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
@@ -8080,11 +8431,11 @@
 msgstr "{0} herunterladen"
 
-#: ../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 "Verbinde zu WMS-Server..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:157
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:158
 msgid "Create buildings"
 msgstr "Gebäude erstellen"
@@ -8105,13 +8456,13 @@
 "Millisime (Jahr)."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:61
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:62
 msgid "Extract SVG ViewBox..."
 msgstr "SVG-Dimensionen extrahieren..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:65
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:66
 msgid "Extract best fitting boundary..."
 msgstr "Optimale Dimensionen extrahieren..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:126
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:127
 msgid "Create boundary"
 msgstr "Grenze erstellen"
@@ -8132,5 +8483,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 "Bild vom französischen Kataster-WMS herunterladen"
 
@@ -8227,5 +8578,5 @@
 "Bitte eine auswählen und erneut versuchen."
 
-#: ../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
@@ -8233,59 +8584,28 @@
 msgstr "Leere Ebene"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:176
 #, java-format
 msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr "WMS-Ebene ({0}), {1} Kachel(n) geladen"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:183
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:178
 msgid "Is not vectorized."
 msgstr "Ist nicht vektorisiert."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:179
 #, java-format
 msgid "Raster center: {0}"
 msgstr "Rasterzentrum: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181
 msgid "Is vectorized."
 msgstr "Ist vektorisiert."
 
-#: ../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 "Kommunen-Koordinatenfenster: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:282
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
-msgid "Save WMS layer to file"
-msgstr "WMS-Ebene in Datei speichern"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:287
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:295
-msgid "Save WMS layer"
-msgstr "WMS-Ebene speichern"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:309
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
-msgid "Load WMS layer from file"
-msgstr "WMS-Ebene aus Datei laden"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:314
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:323
-msgid "Load WMS layer"
-msgstr "WMS-Ebene laden"
-
-#: ../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 "WMS-Datei-Version nicht unterstützt; gefunden {0}, erwartet {1}"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:325
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:335
-msgid "File Format Error"
-msgstr "Dateiformatfehler"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:481
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:401
 #, java-format
 msgid ""
@@ -8297,16 +8617,16 @@
 "Erzeuge eine neue Datei."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:482
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402
 msgid "Cache Format Error"
 msgstr "Zwischenspeicher-Formatfehler"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:497
-#, java-format
-msgid "Lambert zone {0} in cache  incompatible with current Lambert zone {1}"
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417
+#, java-format
+msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 "Lambert-Zone {0} im Cache ist mit der gegenwärtigen Lambert-Zone {1} "
 "inkompatibel"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:499
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:419
 msgid "Cache Lambert Zone Error"
 msgstr "Lambert-Zonenfehler zwischenspeichern"
@@ -8404,11 +8724,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 "Weg aus GPX-Ebene importieren"
 
 #: ../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 "Existierenden Weg verwerfen"
@@ -8418,5 +8738,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 "Keine GPX-Datenebene gefunden."
@@ -8440,5 +8760,5 @@
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:86
 msgid "A By Distance"
-msgstr "A Nach Distanz"
+msgstr "A Nach Entfernung"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:87
@@ -8448,5 +8768,5 @@
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:88
 msgid "B By Distance"
-msgstr "B Nach Distanz"
+msgstr "B Nach Entfernung"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:89
@@ -8456,5 +8776,5 @@
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:90
 msgid "C By Distance"
-msgstr "C Nach Distanz"
+msgstr "C Nach Entfernung"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:137
@@ -8707,4 +9027,8 @@
 msgid "Lakewalker trace"
 msgstr "Lake Walker Spur"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:10
+msgid "An unknown error has occurred"
+msgstr "Ein unbekannter Fehler ist aufgetreten"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
@@ -9030,42 +9354,42 @@
 msgstr "Live GPS"
 
-#: ../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 "Gemessene Werte"
 
-#: ../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 "Fenster mit den Messungen öffnen."
 
-#: ../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 "Zurücksetzen"
 
-#: ../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 "Aktuelle Messungen zurücksetzen und Messweg löschen."
 
-#: ../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 "Weglänge"
 
-#: ../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 "Auswahllänge"
 
-#: ../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 "Auswahlfläche"
 
-#: ../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 "Winkel"
 
-#: ../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 "Winkel zwischen zwei gewählten Knoten"
 
-#: ../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 "Ebene für Messungen"
@@ -9127,5 +9451,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 ""
 "Öffnet das OpenStreetBugs-Fenster und aktiviert das automatische "
@@ -9207,5 +9531,5 @@
 msgstr "Osmarender"
 
-#: ../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 "
@@ -9215,9 +9539,9 @@
 "den Pfad zu Firefox ein."
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:123
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:127
 msgid "osmarender options"
 msgstr "Einstellungen für Osmarender"
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:124
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:128
 msgid "Firefox executable"
 msgstr "Firefox-Programm"
@@ -9651,5 +9975,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 "Straßenname"
@@ -9745,6 +10069,6 @@
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:195
-msgid "No intersections found. Nothing was changed."
-msgstr "Keine Überschneidungen gefunden. Es wurde nicht geändert."
+msgid "No intersection found. Nothing was changed."
+msgstr "Keine Überschneidung gefunden. Es wurde nichts geändert."
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:217
@@ -10637,14 +10961,13 @@
 "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."
@@ -10661,12 +10984,11 @@
 "Die komplette LandSat-WMS-URL aus dem Beispiel ist:\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"
 "Für die Metacarta-Kartenkorrektur http://labs.metacarta.com/rectifier/ , "
-"muss nur die relevant ID eingegeben werden.\n"
+"muss nur die relevante ID eingegeben werden.\n"
 "Um einen Metacarta-Kartenkorrektur-Menüeintrag anzulegen, erstellen Sie "
 "manuell eine URL wie in folgendem Beispiel(und ersetzen die 73 durch Ihre "
-"Bild-ID): \n"
+"Bild-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"
@@ -10675,5 +10997,5 @@
 "sind. Im Zweifel verzichten Sie auf die Nutzung."
 
-#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:54
+#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:53
 msgid "WMS Plugin Help"
 msgstr "Hilfe für WMS-Plugin"
@@ -10734,5 +11056,5 @@
 msgstr "Die Position der gewählten WMS-Ebene anpassen"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113
 #, java-format
 msgid ""
@@ -10779,4 +11101,29 @@
 msgid "Alpha channel"
 msgstr "Alphakanal"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
+msgid "Save WMS layer to file"
+msgstr "WMS-Ebene in Datei speichern"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:295
+msgid "Save WMS layer"
+msgstr "WMS-Ebene speichern"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
+msgid "Load WMS layer from file"
+msgstr "WMS-Ebene aus Datei laden"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:323
+msgid "Load WMS layer"
+msgstr "WMS-Ebene laden"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:334
+#, java-format
+msgid "Unsupported WMS file version; found {0}, expected {1}"
+msgstr "WMS-Datei-Version nicht unterstützt; gefunden {0}, erwartet {1}"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:335
+msgid "File Format Error"
+msgstr "Dateiformatfehler"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:163
@@ -10872,4 +11219,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 ""
@@ -10888,5 +11240,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 ""
 "Ein spezielles Plugin für die WMS-Server der französischen Landesvermessung."
@@ -11214,5 +11566,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 "Referenz"
@@ -11714,5 +12066,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 "Breite (Meter)"
@@ -12181,7 +12533,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 "Typ"
@@ -12797,10 +13149,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 "Betreiber"
@@ -13012,7 +13364,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 "Höhe"
@@ -13944,5 +14296,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 "Gebühr"
@@ -14078,5 +14430,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 "Referenznummer (Steig)"
@@ -14084,5 +14436,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 "Fläche"
@@ -14134,11 +14486,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 "Schutzraum"
+
+#. item "Public Transport/Bus Stop" check "Shelter"
 #. </optional>
-#: build/trans_presets.java:1503
+#: build/trans_presets.java:1504
 msgid "Bus Platform"
 msgstr "Bussteig"
 
 #. item
-#: build/trans_presets.java:1504
+#: build/trans_presets.java:1505
 msgid "Edit Bus Platform"
 msgstr "Bussteig bearbeiten"
@@ -14146,5 +14508,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1512
+#: build/trans_presets.java:1513
 msgid "Taxi"
 msgstr "Taxi"
@@ -14152,5 +14514,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 "Taxihaltepunkt bearbeiten"
@@ -14158,5 +14520,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1519
+#: build/trans_presets.java:1520
 msgid "Airport"
 msgstr "Flughafen"
@@ -14164,15 +14526,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 "Flughafen bearbeiten"
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1526
+#: build/trans_presets.java:1527
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1527
+#: build/trans_presets.java:1528
 msgid "ICAO"
 msgstr "ICAO"
@@ -14181,5 +14543,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1532
+#: build/trans_presets.java:1533
 msgid "Accomodation"
 msgstr "Unterkunft"
@@ -14191,5 +14553,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 "Hotel"
@@ -14198,15 +14560,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 "Hotel bearbeiten"
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1539
+#: build/trans_presets.java:1540
 msgid "Stars"
 msgstr "Sterne"
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1541
+#: build/trans_presets.java:1542
 msgid "Motel"
 msgstr "Motel"
@@ -14214,20 +14576,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 "Motel bearbeiten"
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1547
+#: build/trans_presets.java:1548
 msgid "Guest House"
 msgstr "Gästehaus (Bed & Breakfast)"
 
 #. item
-#: build/trans_presets.java:1548
+#: build/trans_presets.java:1549
 msgid "Edit Guest House"
 msgstr "Gästehaus bearbeiten"
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1552
+#: build/trans_presets.java:1553
 msgid "Chalet"
 msgstr "Ferienhaus"
@@ -14235,10 +14597,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 "Ferienhaus bearbeiten"
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1558
+#: build/trans_presets.java:1559
 msgid "Hostel"
 msgstr "Jugendherberge"
@@ -14246,30 +14608,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 "Jugendherberge bearbeiten"
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1564
+#: build/trans_presets.java:1565
 msgid "Alpine Hut"
 msgstr "Alpenhütte"
 
 #. item
-#: build/trans_presets.java:1565
+#: build/trans_presets.java:1566
 msgid "Edit Alpine Hut"
 msgstr "Alpenhütte bearbeiten"
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1570
+#: build/trans_presets.java:1571
 msgid "Caravan Site"
 msgstr "Wohnwagenstellplätze"
 
 #. item
-#: build/trans_presets.java:1571
+#: build/trans_presets.java:1572
 msgid "Edit Caravan Site"
 msgstr "Wohnwagenstellplätze bearbeiten"
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1575
+#: build/trans_presets.java:1576
 msgid "Camping Site"
 msgstr "Campingplatz"
@@ -14277,10 +14639,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 "Campingplatz bearbeiten"
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1582
+#: build/trans_presets.java:1583
 msgid "Food+Drinks"
 msgstr "Essen & Trinken"
@@ -14291,5 +14653,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 "Restaurant"
@@ -14297,5 +14659,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 "Restaurant bearbeiten"
@@ -14303,5 +14665,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 "Küche"
@@ -14309,61 +14671,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 "italienisch"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "chinese"
 msgstr "chinesisch"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "pizza"
 msgstr "Pizza"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "burger"
 msgstr "Hamburger"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "greek"
 msgstr "griechisch"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "german"
 msgstr "deutsch"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "indian"
 msgstr "indisch"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "regional"
 msgstr "regional"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "kebab"
 msgstr "Döner"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "turkish"
 msgstr "türkisch"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "asian"
 msgstr "asiatisch"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "thai"
 msgstr "thailändisch"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "mexican"
 msgstr "mexikanisch"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "japanese"
 msgstr "japanisch"
 
-#: build/trans_presets.java:1590
+#: build/trans_presets.java:1591
 msgid "Fast Food"
 msgstr "Imbiss (Fast Food)"
@@ -14371,9 +14733,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 "Imbiss (Fast Food-Restaurant) bearbeiten"
 
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1598
 msgid "Cafe"
 msgstr "Café"
@@ -14381,10 +14743,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 "Café bearbeiten"
 
 #. item "Food+Drinks/Cafe" text "Name"
-#: build/trans_presets.java:1603
+#: build/trans_presets.java:1604
 msgid "Pub"
 msgstr "Kneipe"
@@ -14392,20 +14754,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 "Kneipe bearbeiten"
 
 #. item "Food+Drinks/Pub" text "Name"
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1610
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item
-#: build/trans_presets.java:1610
+#: build/trans_presets.java:1611
 msgid "Edit Biergarten"
 msgstr "Biergarten bearbeiten"
 
 #. item "Food+Drinks/Biergarten" text "Name"
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1615
 msgid "Bar"
 msgstr "Bar"
@@ -14413,10 +14775,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 "Bar bearbeiten"
 
 #. item "Food+Drinks/Bar" text "Name"
-#: build/trans_presets.java:1620
+#: build/trans_presets.java:1621
 msgid "Nightclub"
 msgstr "Nachtclub"
@@ -14424,20 +14786,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 "Nachtclub bearbeiten"
 
 #. item "Food+Drinks/Nightclub" text "Name"
-#: build/trans_presets.java:1627
+#: build/trans_presets.java:1628
 msgid "Tourism"
 msgstr "Tourismus"
 
 #. group "Tourism"
-#: build/trans_presets.java:1628
+#: build/trans_presets.java:1629
 msgid "Attraction"
 msgstr "Attraktion"
 
 #. item
-#: build/trans_presets.java:1629
+#: build/trans_presets.java:1630
 msgid "Edit Attraction"
 msgstr "Attraktion bearbeiten"
@@ -14446,11 +14808,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 "Öffnungszeiten"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1634
+#: build/trans_presets.java:1635
 msgid "Museum"
 msgstr "Museum"
@@ -14458,10 +14820,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 "Museum bearbeiten"
 
 #. item "Tourism/Museum" text "Name"
-#: build/trans_presets.java:1640
+#: build/trans_presets.java:1641
 msgid "Zoo"
 msgstr "Zoo"
@@ -14470,10 +14832,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 "Zoo bearbeiten"
 
 #. item "Tourism/Zoo" text "Name"
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1648
 msgid "Viewpoint"
 msgstr "Aussichtspunkt"
@@ -14481,25 +14843,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 "Aussichtspunkt bearbeiten"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1652
+#: build/trans_presets.java:1653
 msgid "Look-Out Tower"
 msgstr "Aussichtsturm"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1654
+#: build/trans_presets.java:1655
 msgid "Theme Park"
 msgstr "Themenpark"
 
 #. item
-#: build/trans_presets.java:1655
+#: build/trans_presets.java:1656
 msgid "Edit Theme Park"
 msgstr "Themenpark bearbeiten"
 
 #. item "Tourism/Theme Park" text "Name"
-#: build/trans_presets.java:1659
+#: build/trans_presets.java:1660
 msgid "Artwork"
 msgstr "Kunstausstellung"
@@ -14507,5 +14869,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 "Kunstausstellung bearbeiten"
@@ -14513,5 +14875,5 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1667
 msgid "Information Office"
 msgstr "Informationsbüro"
@@ -14519,83 +14881,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 "Informationsbüro bearbeiten"
 
+#. item "Tourism/Information Office" text "Opening Hours"
+#: build/trans_presets.java:1675
+msgid "Map"
+msgstr "Karte"
+
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1679
 msgid "Map Type"
 msgstr "Kartentyp"
 
 #. item "Tourism/Map" combo "Map Type"
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1679
 msgid "map"
 msgstr "Karte"
 
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1679
 msgid "citymap"
 msgstr "Stadtplan"
 
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1679
 msgid "hikingmap"
 msgstr "Wanderkarte"
 
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1679
 msgid "bicyclemap"
 msgstr "Fahrradkarte"
 
 #. 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 "Nähere Beschreibung"
 
 #. item "Tourism/Map" text "Closer Description"
-#: build/trans_presets.java:1681
+#: build/trans_presets.java:1682
 msgid "Information Board"
 msgstr "Informationstafel"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1686
 msgid "Board Type"
 msgstr "Tafeltyp"
 
 #. item "Tourism/Information Board" combo "Board Type"
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1686
 msgid "board"
 msgstr "Infotafel"
 
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1686
 msgid "history"
 msgstr "Geschichte"
 
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1686
 msgid "nature"
 msgstr "Natur"
 
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1686
 msgid "wildlife"
 msgstr "Wildtiere"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1688
+#: build/trans_presets.java:1689
 msgid "Guidepost (Hiking)"
 msgstr "Wegweiser (Wandern)"
 
 #. item "Tourism/Guidepost (Hiking)" text "Elevation"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1696
 msgid "Other Information Points"
 msgstr "Andere Informationspunkte"
 
-#. 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 "Schutzraum"
-
-#. item
-#: build/trans_presets.java:1703
+#. item
+#: build/trans_presets.java:1704
 msgid "Edit Shelter"
 msgstr "Schutzraum bearbeiten"
@@ -14603,25 +14962,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 "Feuerstelle"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1709
 msgid "Picnic Site"
 msgstr "Picknickplatz"
 
 #. item
-#: build/trans_presets.java:1709
+#: build/trans_presets.java:1710
 msgid "Edit Picnic Site"
 msgstr "Picknickplatz bearbeiten"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1716
 msgid "Historic Places"
 msgstr "Historische Stätten"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1716
+#: build/trans_presets.java:1717
 msgid "Castle"
 msgstr "Burg / Schloß"
@@ -14630,20 +14989,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 "Burg / Schloß bearbeiten"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1724
 msgid "Ruins"
 msgstr "Ruinen"
 
 #. item
-#: build/trans_presets.java:1724
+#: build/trans_presets.java:1725
 msgid "Edit Ruins"
 msgstr "Ruinen bearbeiten"
 
 #. item "Historic Places/Ruins" text "Name"
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1729
 msgid "Archaeological Site"
 msgstr "Ausgrabungsstelle"
@@ -14652,10 +15011,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 "Ausgrabungsstelle bearbeiten"
 
 #. item "Historic Places/Archaeological Site" text "Name"
-#: build/trans_presets.java:1735
+#: build/trans_presets.java:1736
 msgid "Battlefield"
 msgstr "Schlachtfeld"
@@ -14663,5 +15022,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 "Schlachtfeld bearbeiten"
@@ -14669,15 +15028,15 @@
 #. item "Historic Places/Battlefield" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1743
 msgid "Monument"
 msgstr "Baudenkmal"
 
 #. item
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1744
 msgid "Edit Monument"
 msgstr "Baudenkmal bearbeiten"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1748
 msgid "Memorial"
 msgstr "Gedenkstätte"
@@ -14685,45 +15044,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 "Gedenkstätte bearbeiten"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1753
+#: build/trans_presets.java:1754
 msgid "Wayside Cross"
 msgstr "Wegkreuz"
 
 #. item
-#: build/trans_presets.java:1754
+#: build/trans_presets.java:1755
 msgid "Edit Wayside Cross"
 msgstr "Wegkreuz bearbeiten"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1758
+#: build/trans_presets.java:1759
 msgid "Wayside Shrine"
 msgstr "Bildstock"
 
 #. item
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1760
 msgid "Edit Wayside Shrine"
 msgstr "Bildstock bearbeiten"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1765
 msgid "Leisure"
 msgstr "Freizeit"
 
 #. group "Leisure"
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1766
 msgid "Water Park"
 msgstr "Schwimmbad"
 
 #. item
-#: build/trans_presets.java:1766
+#: build/trans_presets.java:1767
 msgid "Edit Water Park"
 msgstr "Schwimmbad bearbeiten"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1770
+#: build/trans_presets.java:1771
 msgid "Playground"
 msgstr "Spielplatz"
@@ -14731,15 +15090,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 "Spielplatz bearbeiten"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1776
+#: build/trans_presets.java:1777
 msgid "Fishing"
 msgstr "Angeln"
 
 #. item
-#: build/trans_presets.java:1777
+#: build/trans_presets.java:1778
 msgid "Edit Fishing"
 msgstr "Angelplatz bearbeiten"
@@ -14747,15 +15106,15 @@
 #. item "Leisure/Fishing" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1783
+#: build/trans_presets.java:1784
 msgid "Sport Facilities"
 msgstr "Sporteinrichtungen"
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1784
+#: build/trans_presets.java:1785
 msgid "Stadium"
 msgstr "Stadion"
 
 #. item
-#: build/trans_presets.java:1785
+#: build/trans_presets.java:1786
 msgid "Edit Stadium"
 msgstr "Stadion bearbeiten"
@@ -14769,6 +15128,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 "Sportart wählen:"
@@ -15144,6 +15503,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
@@ -15176,227 +15535,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 "Mehrfachnutzung"
 
-#: 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 "Bogenschießen"
 
-#: 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 "Leichtathletik"
 
-#: 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 "Australian Football"
 
-#: 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 "Baseball"
 
-#: 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 "Basketball"
 
-#: 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 "Boule"
 
-#: 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 "Bowls"
 
-#: 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 "Kanu"
 
-#: 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 "Klettern"
 
-#: 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 "Kricket"
 
-#: 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 "Kricketnetze"
 
-#: 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 "Krocket"
 
-#: 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 "Fahrradfahren"
 
-#: 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 "Hunderennen"
 
-#: 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 "Reiten"
 
-#: 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 "American Football"
 
-#: 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 "Golf"
 
-#: 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 "Gymnastik"
 
-#: 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 "Hockey"
 
-#: 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 "Pferderennen"
 
-#: 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 "Motorsport"
 
-#: 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 "Pelota"
 
-#: 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 "Schlagball (Racquet)"
 
-#: 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 "Rugby"
 
-#: 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 "Schießen"
 
-#: 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 "Skateboard"
 
-#: 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 "Eislaufen"
 
-#: 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 "Skifahren"
 
-#: 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 "Fußball"
 
-#: 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 "Schwimmen"
 
-#: 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 "Tischtennis"
 
-#: 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 "Tennis"
 
-#: build/trans_presets.java:1793
+#: build/trans_presets.java:1794
 msgid "Sports Centre"
 msgstr "Sporthalle / Fitnesscenter"
 
 #. item
-#: build/trans_presets.java:1794
+#: build/trans_presets.java:1795
 msgid "Edit Sports Centre"
 msgstr "Sporthalle / Fitnesscenter bearbeiten"
 
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1803
 msgid "Pitch"
 msgstr "Spielfeld"
 
 #. item
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1804
 msgid "Edit Pitch"
 msgstr "Spielfeld bearbeiten"
 
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1812
 msgid "Racetrack"
 msgstr "Rennbahn"
 
 #. item
-#: build/trans_presets.java:1812
+#: build/trans_presets.java:1813
 msgid "Edit Racetrack"
 msgstr "Rennbahn bearbeiten"
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1821
 msgid "Golf Course"
 msgstr "Golfanlage"
 
 #. item
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1822
 msgid "Edit Golf Course"
 msgstr "Golfanlage bearbeiten"
 
 #. item "Sport Facilities/Golf Course" text "Name"
-#: build/trans_presets.java:1825
+#: build/trans_presets.java:1826
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item
-#: build/trans_presets.java:1826
+#: build/trans_presets.java:1827
 msgid "Edit Miniature Golf"
 msgstr "Minigolfplatz bearbeiten"
 
 #. item "Sport Facilities/Miniature Golf" text "Name"
-#: build/trans_presets.java:1831
+#: build/trans_presets.java:1832
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1833
 msgid "Multi"
 msgstr "Mehrfachnutzung"
 
 #. item
-#: build/trans_presets.java:1833
+#: build/trans_presets.java:1834
 msgid "Edit Multi"
 msgstr "Mehrfach genutzten Sportplatz bearbeiten"
@@ -15435,191 +15794,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 "Spielfeld"
 
-#: 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 "Sporthalle / Fitnesscenter"
 
-#: 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 "Stadion"
 
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1839
 msgid "10pin"
 msgstr "Bowling"
 
 #. item
-#: build/trans_presets.java:1839
+#: build/trans_presets.java:1840
 msgid "Edit 10pin"
 msgstr "Bowlinghalle bearbeiten"
 
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1845
 msgid "Athletics"
 msgstr "Leichtathletik"
 
 #. item
-#: build/trans_presets.java:1845
+#: build/trans_presets.java:1846
 msgid "Edit Athletics"
 msgstr "Leichtathletikfeld bearbeiten"
 
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1851
 msgid "Archery"
 msgstr "Bogenschießen"
 
 #. item
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:1852
 msgid "Edit Archery"
 msgstr "Bogenschießplatz bearbeiten"
 
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:1857
 msgid "Climbing"
 msgstr "Klettern"
 
 #. item
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:1858
 msgid "Edit Climbing"
 msgstr "Kletterbereich bearbeiten"
 
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1863
 msgid "Canoeing"
 msgstr "Kanufahren"
 
 #. item
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:1864
 msgid "Edit Canoeing"
 msgstr "Kanufahrtstrecke bearbeiten"
 
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:1869
 msgid "Cycling"
 msgstr "Radfahren"
 
 #. item
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1870
 msgid "Edit Cycling"
 msgstr "Radsporthalle oder -kurs bearbeiten"
 
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1875
 msgid "Dog Racing"
 msgstr "Hunderennen"
 
 #. item
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1876
 msgid "Edit Dog Racing"
 msgstr "Trainingsplatz für Hunde bearbeiten"
 
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1881
 msgid "Equestrian"
 msgstr "Reitplatz"
 
 #. item
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:1882
 msgid "Edit Equestrian"
 msgstr "Reitplatz bearbeiten"
 
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1887
 msgid "Horse Racing"
 msgstr "Pferderennen"
 
 #. item
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1888
 msgid "Edit Horse Racing"
 msgstr "Pferderennplatz bearbeiten"
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:1893
 msgid "Gymnastics"
 msgstr "Gymnastik"
 
 #. item
-#: build/trans_presets.java:1893
+#: build/trans_presets.java:1894
 msgid "Edit Gymnastics"
 msgstr "Gymnastikbereich bearbeiten"
 
-#: build/trans_presets.java:1898
+#: build/trans_presets.java:1899
 msgid "Motor Sports"
 msgstr "Motorsport"
 
 #. item
-#: build/trans_presets.java:1899
+#: build/trans_presets.java:1900
 msgid "Edit Motor Sports"
 msgstr "Motorsportplatz bearbeiten"
 
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:1905
 msgid "Skating"
 msgstr "Eislaufen"
 
 #. item
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:1906
 msgid "Edit Skating"
 msgstr "Eislaufbahn bearbeiten"
 
-#: build/trans_presets.java:1910
+#: build/trans_presets.java:1911
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:1912
 msgid "Edit Skateboard"
 msgstr "Skateboardplatz bearbeiten"
 
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:1917
 msgid "Swimming"
 msgstr "Schwimmen"
 
 #. item
-#: build/trans_presets.java:1917
+#: build/trans_presets.java:1918
 msgid "Edit Swimming"
 msgstr "Schwimmbad bearbeiten"
 
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:1923
 msgid "Skiing"
 msgstr "Skifahren"
@@ -15627,56 +15986,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 "Skipiste bearbeiten"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1928
 msgid "Piste type"
 msgstr "Pistentyp"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1928
 msgid "downhill"
 msgstr "Abfahrt"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1928
 msgid "nordic"
 msgstr "Langlauf"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1928
 msgid "snow_park"
 msgstr "Schneepark"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:1929
 msgid "Difficulty"
 msgstr "Schwierigkeit"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:1929
 msgid "novice"
 msgstr "Anfänger"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:1929
 msgid "easy"
 msgstr "einfach"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:1929
 msgid "intermediate"
 msgstr "mittelschwer"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:1929
 msgid "advanced"
 msgstr "fortgeschritten"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:1929
 msgid "expert"
 msgstr "Experte"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:1929
 msgid "freeride"
 msgstr "Freistil"
 
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1932
 msgid "Shooting"
 msgstr "Schießen"
@@ -15684,178 +16043,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 "Schießbahn bearbeiten"
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1940
 msgid "Sport (Ball)"
 msgstr "Ballsport"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1941
 msgid "Soccer"
 msgstr "Fußball"
 
 #. item
-#: build/trans_presets.java:1941
+#: build/trans_presets.java:1942
 msgid "Edit Soccer"
 msgstr "Fußballplatz bearbeiten"
 
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:1947
 msgid "Football"
 msgstr "American Football"
 
 #. item
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:1948
 msgid "Edit Football"
 msgstr "American Football-Platz bearbeiten"
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1953
 msgid "Australian Football"
 msgstr "Australian Football"
 
 #. item
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:1954
 msgid "Edit Australian Football"
 msgstr "Australian Foootball-Platz bearbeiten"
 
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:1959
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:1960
 msgid "Edit Baseball"
 msgstr "Baseballplatz bearbeiten"
 
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:1965
 msgid "Basketball"
 msgstr "Basketball"
 
 #. item
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:1966
 msgid "Edit Basketball"
 msgstr "Basketballplatz bearbeiten"
 
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:1971
 msgid "Golf"
 msgstr "Golfplatz"
 
 #. item
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:1972
 msgid "Edit Golf"
 msgstr "Golfplatz bearbeiten"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1975
 msgid "golf_course"
 msgstr "Golfanlage"
 
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:1977
 msgid "Boule"
 msgstr "Boule"
 
 #. item
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:1978
 msgid "Edit Boule"
 msgstr "Boule-Spielbereich bearbeiten"
 
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:1983
 msgid "Bowls"
 msgstr "Bowls"
 
 #. item
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1984
 msgid "Edit Bowls"
 msgstr "Bowls-Spielfeld bearbeiten"
 
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:1989
 msgid "Cricket"
 msgstr "Kricket"
 
 #. item
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:1990
 msgid "Edit Cricket"
 msgstr "Kricketspielfeld bearbeiten"
 
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:1995
 msgid "Cricket Nets"
 msgstr "Kricketnetze"
 
 #. item
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:1996
 msgid "Edit Cricket Nets"
 msgstr "Kricketnetze bearbeiten"
 
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:2001
 msgid "Croquet"
 msgstr "Krocket"
 
 #. item
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:2002
 msgid "Edit Croquet"
 msgstr "Krocketspielfeld bearbeiten"
 
-#: build/trans_presets.java:2006
+#: build/trans_presets.java:2007
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item
-#: build/trans_presets.java:2007
+#: build/trans_presets.java:2008
 msgid "Edit Hockey"
 msgstr "Hockeyplatz bearbeiten"
 
-#: build/trans_presets.java:2012
+#: build/trans_presets.java:2013
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2014
 msgid "Edit Pelota"
 msgstr "Pelotaplatz bearbeiten"
 
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2019
 msgid "Racquet"
 msgstr "Schlagball (Racquet)"
 
 #. item
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2020
 msgid "Edit Racquet"
 msgstr "Schlagball (Racquet)-Platz bearbeiten"
 
-#: build/trans_presets.java:2024
+#: build/trans_presets.java:2025
 msgid "Rugby"
 msgstr "Rugby"
 
 #. item
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2026
 msgid "Edit Rugby"
 msgstr "Rugbyplatz bearbeiten"
 
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:2031
 msgid "Table Tennis"
 msgstr "Tischtennis"
 
 #. item
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2032
 msgid "Edit Table Tennis"
 msgstr "Tischtennisplatz bearbeiten"
 
-#: 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 "Tennisplatz bearbeiten"
 
 #. <separator/>
-#: build/trans_presets.java:2044
+#: build/trans_presets.java:2045
 msgid "Buildings"
 msgstr "Gebäude"
 
 #. group "Buildings"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2046
 msgid "Building"
 msgstr "Gebäude"
@@ -15863,5 +16222,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2049
 msgid "Public Building"
 msgstr "Öffentliches Gebäude"
@@ -15869,10 +16228,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 "Öffentliches Gebäuden bearbeiten"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2055
 msgid "Town hall"
 msgstr "Rathaus"
@@ -15880,10 +16239,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 "Rathaus bearbeiten"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2061
 msgid "Embassy"
 msgstr "Botschaft"
@@ -15891,10 +16250,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 "Botschaft bearbeiten"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2066
+#: build/trans_presets.java:2067
 msgid "Courthouse"
 msgstr "Gericht"
@@ -15903,10 +16262,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 "Gericht bearbeiten"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2074
 msgid "Prison"
 msgstr "Gefängnis"
@@ -15915,10 +16274,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 "Gefängnis bearbeiten"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2080
+#: build/trans_presets.java:2081
 msgid "Police"
 msgstr "Polizei"
@@ -15928,10 +16287,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 "Polizei bearbeiten"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2089
 msgid "Fire Station"
 msgstr "Feuerwache"
@@ -15940,10 +16299,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 "Feuerwache bearbeiten"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2096
 msgid "Post Office"
 msgstr "Post"
@@ -15951,5 +16310,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 "Post bearbeiten"
@@ -15957,15 +16316,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2103
 msgid "Kindergarten"
 msgstr "Kindergarten"
 
 #. item
-#: build/trans_presets.java:2103
+#: build/trans_presets.java:2104
 msgid "Edit Kindergarten"
 msgstr "Kindergarten bearbeiten"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2108
 msgid "School"
 msgstr "Schule"
@@ -15973,10 +16332,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 "Schule bearbeiten"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2114
 msgid "University"
 msgstr "Universität"
@@ -15984,10 +16343,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 "Universität bearbeiten"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2120
 msgid "College"
 msgstr "Hochschule"
@@ -15995,5 +16354,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 "College bearbeiten"
@@ -16001,5 +16360,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2126
+#: build/trans_presets.java:2127
 msgid "Cinema"
 msgstr "Kino"
@@ -16008,10 +16367,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 "Kino bearbeiten"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2133
+#: build/trans_presets.java:2134
 msgid "Library"
 msgstr "Bibliothek"
@@ -16020,10 +16379,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 "Bibliothek bearbeiten"
 
 #. item "Buildings/Library" text "Name"
-#: build/trans_presets.java:2140
+#: build/trans_presets.java:2141
 msgid "Arts Centre"
 msgstr "Kulturzentrum"
@@ -16031,10 +16390,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 "Kulturzentrum bearbeiten"
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2146
+#: build/trans_presets.java:2147
 msgid "Theatre"
 msgstr "Theater"
@@ -16043,10 +16402,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 "Theater bearbeiten"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2154
 msgid "Place of Worship"
 msgstr "Kirche"
@@ -16056,5 +16415,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 "Kirche bearbeiten"
@@ -16063,6 +16422,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 "Religion"
@@ -16071,66 +16430,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 "bahaiistisch"
 
-#: 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 "buddhistisch"
 
-#: 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 "christlich"
 
-#: 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 "hinduistisch"
 
-#: 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 "jainistisch"
 
-#: 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 "jüdisch"
 
-#: 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 "moslemisch"
 
-#: 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 "sikhistisch"
 
-#: 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 "spiritistisch"
 
-#: 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 "taoistisch"
 
-#: 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 "unitarisch"
 
-#: 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 "zoroastrisch"
 
-#: 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 "Konfession"
@@ -16139,81 +16498,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 "anglikanisch"
 
-#: 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 "baptistisch"
 
-#: 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 "katholisch"
 
-#: 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 "evangelikal"
 
-#: 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 "Zeugen Jehovas"
 
-#: 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 "lutherisch"
 
-#: 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 "methodistisch"
 
-#: 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 "mormonisch"
 
-#: 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 "orthodox"
 
-#: 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 "Pfingstgemeinde"
 
-#: 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 "presbyterianisch"
 
-#: 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 "protestantisch"
 
-#: 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 "Quäker"
 
-#: 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 "schiitisch"
 
-#: 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 "sunnitisch"
 
 #. <separator/>
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2165
 msgid "Addresses"
 msgstr "Adressen"
@@ -16222,5 +16581,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 "Adressinformationen bearbeiten"
@@ -16228,5 +16587,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2169
+#: build/trans_presets.java:2170
 msgid "House number"
 msgstr "Hausnummer"
@@ -16234,20 +16593,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2172
 msgid "House name"
 msgstr "Hausname"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2174
 msgid "City name"
 msgstr "Ortsname"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2174
+#: build/trans_presets.java:2175
 msgid "Post code"
 msgstr "Postleitzahl"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2176
 msgid "Country code"
 msgstr "Länderkennung"
@@ -16255,5 +16614,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2179
 msgid "Address Interpolation"
 msgstr "Adressinterpolation"
@@ -16262,5 +16621,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 "Adressinterpolation bearbeiten"
@@ -16268,71 +16627,71 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2184
 msgid "Numbering scheme"
 msgstr "Nummernschema"
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2184
 msgid "odd"
 msgstr "ungerade"
 
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2184
 msgid "even"
 msgstr "gerade"
 
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2184
 msgid "all"
 msgstr "alle"
 
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2184
 msgid "alphabetic"
 msgstr "alphabetisch"
 
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2187
 msgid "Man Made"
 msgstr "Zivilisationsbauten"
 
 #. group "Man Made"
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2188
 msgid "Works"
 msgstr "Fabrik"
 
 #. item
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2189
 msgid "Edit Works"
 msgstr "Fabrik bearbeiten"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2193
 msgid "Tower"
 msgstr "Turm"
 
 #. item
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2194
 msgid "Edit Tower"
 msgstr "Turm bearbeiten"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2198
 msgid "Water Tower"
 msgstr "Wasserturm"
 
 #. item
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2199
 msgid "Edit Water Tower"
 msgstr "Wasserturm bearbeiten"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2203
 msgid "Gasometer"
 msgstr "Gasometer"
 
 #. item
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2204
 msgid "Edit Gasometer"
 msgstr "Gasometer bearbeiten"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2207
+#: build/trans_presets.java:2208
 msgid "Lighthouse"
 msgstr "Leuchtturm"
@@ -16340,10 +16699,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 "Leuchtturm bearbeiten"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2214
 msgid "Windmill"
 msgstr "Windmühle"
@@ -16351,10 +16710,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 "Windmühle bearbeiten"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2220
 msgid "Pipeline"
 msgstr "Pipeline"
@@ -16362,10 +16721,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 "Pipeline bearbeiten"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2225
+#: build/trans_presets.java:2226
 msgid "Wastewater Plant"
 msgstr "Kläranlage"
@@ -16375,10 +16734,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 "Kläranlage bearbeiten"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2233
+#: build/trans_presets.java:2234
 msgid "Crane"
 msgstr "Stationärer Kran"
@@ -16386,10 +16745,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 "Stationären Kran bearbeiten"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2239
+#: build/trans_presets.java:2240
 msgid "Beacon"
 msgstr "Bake"
@@ -16397,10 +16756,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 "Bake bearbeiten"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2245
+#: build/trans_presets.java:2246
 msgid "Survey Point"
 msgstr "Vermessungspunkt"
@@ -16408,10 +16767,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 "Vermessungspunkt bearbeiten"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2252
 msgid "Surveillance"
 msgstr "Überwachungskamera"
@@ -16419,5 +16778,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 "Überwachungskamera bearbeiten"
@@ -16425,5 +16784,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2258
+#: build/trans_presets.java:2259
 msgid "Power Generator"
 msgstr "Stromgenerator"
@@ -16433,39 +16792,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 "Stromgenerator bearbeiten"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "wind"
 msgstr "Wind"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "hydro"
 msgstr "Wasser"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "fossil"
 msgstr "Fossil"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "nuclear"
 msgstr "Nuklear"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "coal"
 msgstr "Kohle"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "photovoltaic"
 msgstr "Photovoltaik"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "gas"
 msgstr "Gas"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2268
 msgid "Power Station"
 msgstr "Umspannwerk"
@@ -16474,10 +16833,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 "Umspannwerk bearbeiten"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2274
+#: build/trans_presets.java:2275
 msgid "Power Sub Station"
 msgstr "Trafostation"
@@ -16486,5 +16845,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 "Trafostation bearbeiten"
@@ -16492,10 +16851,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 "Liniennummer"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2282
+#: build/trans_presets.java:2283
 msgid "Power Tower"
 msgstr "Strommast"
@@ -16506,5 +16865,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 "Strommast bearbeiten"
@@ -16512,5 +16871,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 "Stromleitung"
@@ -16519,25 +16878,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 "Stromleitung bearbeiten"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2298
 msgid "Voltage"
 msgstr "Spannung"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2299
 msgid "Amount of Wires"
 msgstr "Leitungsanzahl"
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2301
+#: build/trans_presets.java:2302
 msgid "Amenities"
 msgstr "Einrichtungen"
 
 #. group "Amenities"
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2303
 msgid "Toilets"
 msgstr "Toiletten"
@@ -16545,20 +16904,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 "Referenznummer"
 
 #. 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 "Kommentar"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2312
 msgid "Post Box"
 msgstr "Briefkasten"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2317
 msgid "Telephone"
 msgstr "Telefon"
@@ -16567,5 +16926,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 "Telefon bearbeiten"
@@ -16573,5 +16932,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ünzen"
@@ -16579,5 +16938,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 "Scheine"
@@ -16585,5 +16944,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 "Geld- oder Prepaidkarten"
@@ -16591,5 +16950,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 "Konto- oder EC-Karten"
@@ -16597,15 +16956,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 "Kreditkarten"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2328
 msgid "Telephone cards"
 msgstr "Telefonkarten"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2330
 msgid "Recycling"
 msgstr "Recyclingstelle & -container"
@@ -16614,5 +16973,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 "Recyclingstelle oder -container bearbeiten"
@@ -16620,35 +16979,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 "Batterien"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2336
 msgid "Cans"
 msgstr "Dosen"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2337
 msgid "Clothes"
 msgstr "Kleidung"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2338
 msgid "Glass"
 msgstr "Glas"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2339
 msgid "Paper"
 msgstr "Papier"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2340
 msgid "Scrap Metal"
 msgstr "Altmetall"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2342
 msgid "Bench"
 msgstr "Bank"
@@ -16657,20 +17016,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 "Jagdanstand"
 
 #. item
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2347
 msgid "Edit Hunting Stand"
 msgstr "Jagdanstand bearbeiten"
 
 #. item "Amenities/Hunting Stand" check "Shelter"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2350
 msgid "Hide"
 msgstr "Versteck"
 
 #. item "Amenities/Hunting Stand" check "Hide"
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2351
 msgid "Lock"
 msgstr "Schloß"
@@ -16678,22 +17037,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 "Höhe"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2351
+#: build/trans_presets.java:2352
 msgid "low"
 msgstr "niedrig"
 
-#: build/trans_presets.java:2351
+#: build/trans_presets.java:2352
 msgid "half"
 msgstr "halb"
 
-#: build/trans_presets.java:2351
+#: build/trans_presets.java:2352
 msgid "full"
 msgstr "voll"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2354
 msgid "Fountain"
 msgstr "Springbrunnen"
@@ -16702,10 +17061,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 "Springbrunnen bearbeiten"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2361
 msgid "Drinking Water"
 msgstr "Trinkwasser"
@@ -16714,10 +17073,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 "Trinkwasserabgabe bearbeiten"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2367
+#: build/trans_presets.java:2368
 msgid "Baby Hatch"
 msgstr "Babyklappe"
@@ -16725,25 +17084,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 "Babyklappe bearbeiten"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2375
+#: build/trans_presets.java:2376
 msgid "Shops"
 msgstr "Geschäfte"
 
 #. group "Shops"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2377
 msgid "Supermarket"
 msgstr "Supermarkt"
 
 #. item
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2378
 msgid "Edit Supermarket"
 msgstr "Supermarkt bearbeiten"
 
 #. item "Shops/Supermarket" text "Name"
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:2382
 msgid "Convenience Store"
 msgstr "Tante-Emma-Laden"
@@ -16751,10 +17110,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 "Tante-Emma-Laden bearbeiten"
 
 #. item "Shops/Convenience Store" text "Name"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2388
 msgid "Kiosk"
 msgstr "Kiosk"
@@ -16762,10 +17121,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 "Kiosk bearbeiten"
 
 #. item "Shops/Kiosk" text "Name"
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2394
 msgid "Vending machine"
 msgstr "Verkaufsautomat"
@@ -16773,5 +17132,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 "Automaten bearbeiten"
@@ -16779,88 +17138,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 "Automatenprodukte"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "public_transport_tickets"
 msgstr "Fahrscheine"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "public_transport_plans"
 msgstr "Pläne des öffentlichen Nahverkehrs"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "parking_tickets"
 msgstr "Parkscheine"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "food"
 msgstr "Essen"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "drinks"
 msgstr "Getränke"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "sweets"
 msgstr "Süßigkeiten"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "cigarettes"
 msgstr "Zigaretten"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "photos"
 msgstr "Fotos"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "animal_food"
 msgstr "Tiernahrung"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "news_papers"
 msgstr "Zeitungen"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "toys"
 msgstr "Spielzeug"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "stamps"
 msgstr "Briefmarken"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "SIM-cards"
 msgstr "SIM-Karten"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "telephone_vouchers"
 msgstr "Telefonkarten"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "vouchers"
 msgstr "Karten/Belege"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "condoms"
 msgstr "Kondome"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "tampons"
 msgstr "Tampons"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "excrement_bags"
 msgstr "Hundekot-Tüten"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2407
 msgid "Account or loyalty cards"
 msgstr "Kundenkarten"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2408
+#: build/trans_presets.java:2409
 msgid "Butcher"
 msgstr "Fleischer"
@@ -16868,10 +17227,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 "Fleischer bearbeiten"
 
 #. item "Shops/Butcher" text "Name"
-#: build/trans_presets.java:2414
+#: build/trans_presets.java:2415
 msgid "Baker"
 msgstr "Bäcker"
@@ -16879,10 +17238,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 "Bäcker bearbeiten"
 
 #. item "Shops/Baker" text "Name"
-#: build/trans_presets.java:2420
+#: build/trans_presets.java:2421
 msgid "Florist"
 msgstr "Blumenladen"
@@ -16890,20 +17249,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 "Blumenladen bearbeiten"
 
 #. item "Shops/Florist" text "Name"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2427
 msgid "Organic"
 msgstr "Bioladen"
 
 #. item
-#: build/trans_presets.java:2427
+#: build/trans_presets.java:2428
 msgid "Edit Organic Shop"
 msgstr "Bioladen bearbeiten"
 
 #. item "Shops/Organic" text "Name"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2432
 msgid "Alcohol"
 msgstr "Spirituosen"
@@ -16911,60 +17270,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 "Spirituosengeschäft bearbeiten"
 
 #. item "Shops/Alcohol" text "Name"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2438
 msgid "Beverages"
 msgstr "Getränke"
 
 #. item
-#: build/trans_presets.java:2438
+#: build/trans_presets.java:2439
 msgid "Edit Beverages Shop"
 msgstr "Getränkeladen bearbeiten"
 
 #. item "Shops/Beverages" text "Name"
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:2443
 msgid "Computer"
 msgstr "Computer"
 
 #. item
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2444
 msgid "Edit Computer Shop"
 msgstr "Computergeschäft bearbeiten"
 
 #. item "Shops/Computer" text "Name"
-#: build/trans_presets.java:2447
+#: build/trans_presets.java:2448
 msgid "Electronics"
 msgstr "Elektronikgeschäft"
 
 #. item
-#: build/trans_presets.java:2448
+#: build/trans_presets.java:2449
 msgid "Edit Electronics Shop"
 msgstr "Elektronikgeschäft bearbeiten"
 
 #. item "Shops/Electronics" text "Name"
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2453
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2454
 msgid "Edit Hifi Shop"
 msgstr "Hifi-Geschäft bearbeiten"
 
 #. item "Shops/Hifi" text "Name"
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2458
 msgid "Furniture"
 msgstr "Mobiliar"
 
 #. item
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2459
 msgid "Edit Furniture Shop"
 msgstr "Möbelgeschäft bearbeiten"
 
 #. item "Shops/Furniture" text "Name"
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2463
 msgid "Garden Centre"
 msgstr "Gartenzentrum"
@@ -16972,10 +17331,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 "Gartenzentrum bearbeiten"
 
 #. item "Shops/Garden Centre" text "Name"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2469
 msgid "Hardware"
 msgstr "Haushaltswaren"
@@ -16983,10 +17342,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 "Haushaltswaren bearbeiten"
 
 #. item "Shops/Hardware" text "Name"
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2475
 msgid "Do-it-yourself-store"
 msgstr "Heimwerkerbedarf"
@@ -16994,60 +17353,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 "Geschäft für Heimwerkerbedarf bearbeiten"
 
 #. item "Shops/Do-it-yourself-store" text "Name"
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2481
 msgid "Stationery"
 msgstr "Bürobedarf"
 
 #. item
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2482
 msgid "Edit Stationery Shop"
 msgstr "Bürobedarf bearbeiten"
 
 #. item "Shops/Stationery" text "Name"
-#: build/trans_presets.java:2485
+#: build/trans_presets.java:2486
 msgid "Hairdresser"
 msgstr "Friseur"
 
 #. item
-#: build/trans_presets.java:2486
+#: build/trans_presets.java:2487
 msgid "Edit Hairdresser"
 msgstr "Friseur bearbeiten"
 
 #. item "Shops/Hairdresser" text "Name"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2491
 msgid "Shoes"
 msgstr "Schuhe"
 
 #. item
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2492
 msgid "Edit Shoe Shop"
 msgstr "Schuhladen bearbeiten"
 
 #. item "Shops/Shoes" text "Name"
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2496
 msgid "Toys"
 msgstr "Spielzeug"
 
 #. item
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2497
 msgid "Edit Toy Shop"
 msgstr "Spielzeuggeschäft bearbeiten"
 
 #. item "Shops/Toys" text "Name"
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2501
 msgid "Video"
 msgstr "Videoverleih"
 
 #. item
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2502
 msgid "Edit Video Shop"
 msgstr "Videogeschäft bearbeiten"
 
 #. item "Shops/Video" text "Name"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2506
 msgid "Dry Cleaning"
 msgstr "Chemische Reinigung"
@@ -17055,10 +17414,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 "Chemische Reinigung bearbeiten"
 
 #. item "Shops/Dry Cleaning" text "Name"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2512
 msgid "Laundry"
 msgstr "Waschsalon"
@@ -17066,10 +17425,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 "Waschsalon bearbeiten"
 
 #. item "Shops/Laundry" text "Name"
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2518
 msgid "Outdoor"
 msgstr "Camping (Outdoor)"
@@ -17077,35 +17436,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 "Laden für Camping- (Outdoor-)bedarf bearbeiten"
 
 #. 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 "Sportgeschäft bearbeiten"
 
 #. item "Shops/Sports" text "Name"
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2529
 msgid "Optician"
 msgstr "Optiker"
 
 #. item
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2530
 msgid "Edit Optician"
 msgstr "Optiker bearbeiten"
 
 #. item "Shops/Optician" text "Name"
-#: build/trans_presets.java:2535
+#: build/trans_presets.java:2536
 msgid "Cash"
 msgstr "Geld"
 
 #. group "Cash"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2537
 msgid "Bank"
 msgstr "Bank"
@@ -17113,5 +17472,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 "Bank bearbeiten"
@@ -17119,10 +17478,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 "Geldautomat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2544
 msgid "Money Exchange"
 msgstr "Wechselstube"
@@ -17130,5 +17489,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 "Wechselstube bearbeiten"
@@ -17136,15 +17495,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 "Geldautomat bearbeiten"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2557
 msgid "Health"
 msgstr "Gesundheit"
 
 #. group "Health"
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2558
 msgid "Doctors"
 msgstr "Arzt"
@@ -17152,20 +17511,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 "Arzt bearbeiten"
 
 #. item "Health/Doctors" text "Name"
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2564
 msgid "Dentist"
 msgstr "Zahnarzt"
 
 #. item
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2565
 msgid "Edit Dentist"
 msgstr "Zahnarzt bearbeiten"
 
 #. item "Health/Dentist" text "Name"
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2569
 msgid "Pharmacy"
 msgstr "Apotheke"
@@ -17173,5 +17532,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 "Apotheke bearbeiten"
@@ -17179,10 +17538,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 "Rezepteinlösung"
 
 #. item "Health/Pharmacy" text "Name"
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2576
 msgid "Hospital"
 msgstr "Krankenhaus"
@@ -17190,10 +17549,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 "Krankenhaus bearbeiten"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2582
 msgid "Emergency Access Point"
 msgstr "Notfallrettungspunkt"
@@ -17202,5 +17561,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 "Notfallrettungspunkt bearbeiten"
@@ -17209,20 +17568,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2588
 msgid "Point Number"
 msgstr "Punktnummer"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2589
 msgid "Point Name"
 msgstr "Punktname"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2591
 msgid "Phone Number"
 msgstr "Telefonnummer"
 
 #. 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 "(Internationale Nummer verwenden, z.B. +49-123-45678)"
@@ -17230,5 +17589,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 "Tierarzt"
@@ -17237,25 +17596,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 "Tierarzt bearbeiten"
 
 #. 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 "Kontinent bearbeiten"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2611
 msgid "Country"
 msgstr "Staat"
 
 #. item
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2612
 msgid "Edit Country"
 msgstr "Staat bearbeiten"
@@ -17263,30 +17622,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 "Bundesland"
 
 #. item
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2618
 msgid "Edit State"
 msgstr "Bundesland bearbeiten"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2622
+#: build/trans_presets.java:2623
 msgid "Region"
 msgstr "Region"
 
 #. item
-#: build/trans_presets.java:2623
+#: build/trans_presets.java:2624
 msgid "Edit Region"
 msgstr "Region bearbeiten"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2628
+#: build/trans_presets.java:2629
 msgid "County"
 msgstr "Landkreis"
 
 #. item
-#: build/trans_presets.java:2629
+#: build/trans_presets.java:2630
 msgid "Edit County"
 msgstr "Landkreis bearbeiten"
@@ -17294,15 +17653,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2635
+#: build/trans_presets.java:2636
 msgid "City"
 msgstr "Großstadt"
 
 #. item
-#: build/trans_presets.java:2636
+#: build/trans_presets.java:2637
 msgid "Edit City"
 msgstr "Großstadt bearbeiten"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2641
+#: build/trans_presets.java:2642
 msgid "Town"
 msgstr "Stadt"
@@ -17310,10 +17669,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 "Stadt bearbeiten"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2649
 msgid "Suburb"
 msgstr "Stadtteil"
@@ -17321,25 +17680,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 "Stadtteil bearbeiten"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2656
 msgid "Village"
 msgstr "Dorf"
 
 #. item
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2657
 msgid "Edit Village"
 msgstr "Dorf bearbeiten"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2662
 msgid "Hamlet"
 msgstr "Weiler"
 
 #. item
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2663
 msgid "Edit Hamlet"
 msgstr "Weiler bearbeiten"
@@ -17347,5 +17706,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2669
 msgid "Locality"
 msgstr "Unbewohnter Ort"
@@ -17353,10 +17712,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 "Unbewohnten Ort bearbeiten"
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2676
 msgid "Island"
 msgstr "Insel"
@@ -17364,5 +17723,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 "Insel bearbeiten"
@@ -17370,5 +17729,5 @@
 #. item "Places/Island" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2683
+#: build/trans_presets.java:2684
 msgid "Cave Entrance"
 msgstr "Höhleneingang"
@@ -17376,10 +17735,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 "Höhleneingang bearbeiten"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2690
 msgid "Peak"
 msgstr "Bergspitze"
@@ -17387,10 +17746,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 "Bergspitze bearbeiten"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2697
 msgid "Glacier"
 msgstr "Gletscher"
@@ -17398,10 +17757,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 "Gletscher bearbeiten"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2703
+#: build/trans_presets.java:2704
 msgid "Volcano"
 msgstr "Vulkan"
@@ -17409,70 +17768,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 "Vulkan bearbeiten"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2711
+#: build/trans_presets.java:2712
 msgid "Boundaries"
 msgstr "Grenzen"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2713
 msgid "National"
 msgstr "Staat"
 
 #. item
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2714
 msgid "Edit National Boundary"
 msgstr "Staatsgrenze bearbeiten"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2718
+#: build/trans_presets.java:2719
 msgid "Administrative"
 msgstr "Innerstaatlich"
 
 #. item
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2720
 msgid "Edit Administrative Boundary"
 msgstr "Innerstaatliche Grenze bearbeiten"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2724
+#: build/trans_presets.java:2725
 msgid "Civil"
 msgstr "Zivil"
 
 #. item
-#: build/trans_presets.java:2725
+#: build/trans_presets.java:2726
 msgid "Edit Civil Boundary"
 msgstr "Zivilrechtliche Grenze bearbeiten"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2730
+#: build/trans_presets.java:2731
 msgid "Political"
 msgstr "Politisch"
 
 #. item
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:2732
 msgid "Edit Political Boundary"
 msgstr "Politische Grenze bearbeiten"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2736
+#: build/trans_presets.java:2737
 msgid "National park"
 msgstr "Nationalpark"
 
 #. item
-#: build/trans_presets.java:2737
+#: build/trans_presets.java:2738
 msgid "Edit National Park Boundary"
 msgstr "Nationalparkgrenze bearbeiten"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2744
 msgid "Land use"
 msgstr "Landnutzung"
 
 #. group "Land use"
-#: build/trans_presets.java:2744
+#: build/trans_presets.java:2745
 msgid "Tree"
 msgstr "Baum"
@@ -17481,15 +17840,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 "Baum bearbeiten"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2753
 msgid "Botanical Name"
 msgstr "Botanischer Name"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2755
 msgid "Wood"
 msgstr "Naturwald"
@@ -17498,5 +17857,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 "Naturwald bearbeiten"
@@ -17504,17 +17863,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 "Nadelwald"
 
-#: build/trans_presets.java:2760 build/trans_presets.java:2769
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
 msgid "deciduous"
 msgstr "Laubwald"
 
-#: build/trans_presets.java:2760 build/trans_presets.java:2769
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
 msgid "mixed"
 msgstr "Mischwald"
 
-#: build/trans_presets.java:2762
+#: build/trans_presets.java:2763
 msgid "Forest"
 msgstr "Forst"
@@ -17523,14 +17882,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 "Forst bearbeiten"
 
-#: build/trans_presets.java:2771
+#: build/trans_presets.java:2772
 msgid "Nature Reserve"
 msgstr "Naturdenkmal & Reservat"
 
 #. item
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2773
 msgid "Edit Nature Reserve"
 msgstr "Naturdenkmal oder Reservat bearbeiten"
@@ -17538,25 +17897,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2777
+#: build/trans_presets.java:2778
 msgid "Scree"
 msgstr "Geröll"
 
 #. item
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:2779
 msgid "Edit Scree"
 msgstr "Geröll bearbeiten"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2783
 msgid "Scrub"
 msgstr "Buschland"
 
 #. item
-#: build/trans_presets.java:2783
+#: build/trans_presets.java:2784
 msgid "Edit Scrub"
 msgstr "Buschland bearbeiten"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2788
 msgid "Fell"
 msgstr "Gebirge"
@@ -17564,10 +17923,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 "Gebirge bearbeiten"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2794
 msgid "Heath"
 msgstr "Heide"
@@ -17575,5 +17934,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 "Heide bearbeiten"
@@ -17581,5 +17940,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2801
 msgid "Farmyard"
 msgstr "Bauernhof"
@@ -17588,45 +17947,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 "Bauernhof bearbeiten"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2808
+#: build/trans_presets.java:2809
 msgid "Farmland"
 msgstr "Ackerland"
 
 #. item
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2810
 msgid "Edit Farmland Landuse"
 msgstr "Ackerland bearbeiten"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2814
+#: build/trans_presets.java:2815
 msgid "Meadow"
 msgstr "Wiese"
 
 #. item
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2816
 msgid "Edit Meadow Landuse"
 msgstr "Wiese bearbeiten"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2820
+#: build/trans_presets.java:2821
 msgid "Vineyard"
 msgstr "Weinberg"
 
 #. item
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2822
 msgid "Edit Vineyard Landuse"
 msgstr "Weinberg bearbeiten"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2826
+#: build/trans_presets.java:2827
 msgid "Allotments"
 msgstr "Schrebergärten"
 
 #. item
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:2828
 msgid "Edit Allotments Landuse"
 msgstr "Schrebergärten bearbeiten"
@@ -17634,25 +17993,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2833
+#: build/trans_presets.java:2834
 msgid "Garden"
 msgstr "Garten"
 
 #. item
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2835
 msgid "Edit Garden"
 msgstr "Garten bearbeiten"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2838
+#: build/trans_presets.java:2839
 msgid "Grass"
 msgstr "Gras"
 
 #. item
-#: build/trans_presets.java:2839
+#: build/trans_presets.java:2840
 msgid "Edit Grass Landuse"
 msgstr "Grasfläche bearbeiten"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2845
 msgid "Village Green"
 msgstr "Dorfanger"
@@ -17660,10 +18019,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 "Dorfanger bearbeiten"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:2852
 msgid "Common"
 msgstr "Öffentlicher Bereich"
@@ -17671,20 +18030,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 "Öffentlichen Bereich bearbeiten"
 
 #. 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 "Park bearbeiten"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2863
 msgid "Recreation Ground"
 msgstr "Erholungsgebiet"
@@ -17692,5 +18051,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 "Erholungsgebiet bearbeiten"
@@ -17698,15 +18057,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2871
 msgid "Residential area"
 msgstr "Wohngebiet"
 
 #. item
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2872
 msgid "Edit Residential Landuse"
 msgstr "Wohngebiet bearbeiten"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2877
 msgid "Graveyard"
 msgstr "Kleiner Friedhof"
@@ -17714,9 +18073,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 "Kleinen Friedhof bearbeiten"
 
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:2885
 msgid "Cemetery"
 msgstr "Friedhof"
@@ -17724,39 +18083,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 "Friedhof bearbeiten"
 
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2894
 msgid "Retail"
 msgstr "Einkaufsbereich"
 
 #. item
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2895
 msgid "Edit Retail Landuse"
 msgstr "Einkaufsbereich bearbeiten"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2900
 msgid "Commercial"
 msgstr "Gewerbegebiet"
 
 #. item
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2901
 msgid "Edit Commercial Landuse"
 msgstr "Gewerbegebiet bearbeiten"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2906
 msgid "Industrial"
 msgstr "Industrie"
 
 #. item
-#: build/trans_presets.java:2906
+#: build/trans_presets.java:2907
 msgid "Edit Industrial Landuse"
 msgstr "Industriegebiet bearbeiten"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2912
 msgid "Railway land"
 msgstr "Eisenbahngelände"
@@ -17764,15 +18123,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 "Eisenbahngelände bearbeiten"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:2919
 msgid "Military"
 msgstr "Militärgebiet"
 
 #. item
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2920
 msgid "Edit Military Landuse"
 msgstr "Militärgebiet bearbeiten"
@@ -17780,55 +18139,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2925
+#: build/trans_presets.java:2926
 msgid "Construction area"
 msgstr "Baustellengebiet"
 
 #. item
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2927
 msgid "Edit Construction Landuse"
 msgstr "Baustelle bearbeiten"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2932
 msgid "Brownfield"
 msgstr "Baulücke"
 
 #. item
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:2933
 msgid "Edit Brownfield Landuse"
 msgstr "Baulücke bearbeiten"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2937
+#: build/trans_presets.java:2938
 msgid "Greenfield"
 msgstr "Bauland"
 
 #. item
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:2939
 msgid "Edit Greenfield Landuse"
 msgstr "Bauland bearbeiten"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:2944
 msgid "Landfill"
 msgstr "Deponie"
 
 #. item
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:2945
 msgid "Edit Landfill Landuse"
 msgstr "Deponie bearbeiten"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2950
 msgid "Quarry"
 msgstr "Steinbruch"
 
 #. item
-#: build/trans_presets.java:2950
+#: build/trans_presets.java:2951
 msgid "Edit Quarry Landuse"
 msgstr "Steinbruch bearbeiten"
 
 #. group "Relations"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2960
 msgid "Multipolygon"
 msgstr "Multipolygon"
@@ -17838,5 +18197,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 "Ein Multipolygon bearbeiten"
@@ -17845,10 +18204,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:2970
 msgid "outer segment"
 msgstr "Äußeres Segment"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:2970
+#: build/trans_presets.java:2971
 msgid "inner segment"
 msgstr "Inneres Segment"
@@ -17856,5 +18215,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:2974
 msgid "Turn restriction"
 msgstr "Abbiegeeinschränkung"
@@ -17863,5 +18222,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 "Abbiegeeinschränkung bearbeiten"
@@ -17869,34 +18228,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 "Einschränkung"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_left_turn"
 msgstr "Nicht links abbiegen"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_right_turn"
 msgstr "Nicht rechts abbiegen"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_straight_on"
 msgstr "Nicht geradeaus"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_u_turn"
 msgstr "Wendeverbot"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "only_right_turn"
 msgstr "Nur rechts abbiegen"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "only_left_turn"
 msgstr "Nur links abbiegen"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "only_straight_on"
 msgstr "Nur geradeaus"
@@ -17905,15 +18264,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2983
+#: build/trans_presets.java:2984
 msgid "from way"
 msgstr "Von Weg"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2985
 msgid "via node or way"
 msgstr "Über Knoten oder Weg"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2986
 msgid "to way"
 msgstr "Zu Weg"
@@ -17921,5 +18280,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:2988
+#: build/trans_presets.java:2989
 msgid "Route"
 msgstr "Route"
@@ -17928,5 +18287,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 "Route bearbeiten"
@@ -17934,5 +18293,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 "Routentyp"
@@ -18004,5 +18363,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
@@ -18011,17 +18370,17 @@
 msgstr "Fahrrad"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "bus"
 msgstr "Bus"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "road"
 msgstr "Straße"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "ferry"
 msgstr "Fähre"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "ski"
 msgstr "Ski"
@@ -18074,5 +18433,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
@@ -18081,13 +18440,13 @@
 msgstr "Fuß"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "hiking"
 msgstr "Wandern"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "tram"
 msgstr "Straßenbahn"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "detour"
 msgstr "Umleitung"
@@ -18101,10 +18460,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 "U-Bahn"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:2997
 msgid "Symbol description"
 msgstr "Symbolbeschreibung"
@@ -18112,26 +18471,26 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:2999
+#: build/trans_presets.java:3000
 msgid "Network"
 msgstr "Netzwerk"
 
 #. item "Relations/Route" combo "State"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "proposed"
 msgstr "geplant"
 
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "alternate"
 msgstr "alternativ"
 
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "temporary"
 msgstr "temporär"
 
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "connection"
 msgstr "Verbindung"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3003
 msgid "Color (hex)"
 msgstr "Farbe (hex)"
@@ -18140,30 +18499,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:3006
 msgid "route segment"
 msgstr "Routenabschnitt"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3007
 msgid "forward segment"
 msgstr "Vorwärts-Abschnitt"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3008
 msgid "backward segment"
 msgstr "Rückwärts-Abschnitt"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3009
 msgid "halt point"
 msgstr "Haltepunkt"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3010
 msgid "forward halt point"
 msgstr "Vorwärts-Haltepunkt"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3011
 msgid "backward halt point"
 msgstr "Rückwärts-Haltepunkt"
@@ -22278,25 +22637,6 @@
 msgstr "Terraserver Urban"
 
-#~ msgid "Uploading data"
-#~ msgstr "Daten werden hochgeladen"
-
-#~ msgid "Unknown host"
-#~ msgstr "Rechner unbekannt"
-
-#~ msgid "Metacarta Map Rectifier image id"
-#~ msgstr "Metacarta-Kartenkorrektur Bildnummer"
-
-#~ msgid "rectifier id={0}"
-#~ msgstr "Korrekturnummer={0}"
-
-#~ msgid "Adjust the position of the WMS layer"
-#~ msgstr "Die Position der WMS-Ebene anpassen"
-
-#~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS"
-#~ msgstr "Berichtigtes Bild von Metacartas-WMS-Kartenkorrektur herunterladen"
-
-#~ msgid "Not initialized"
-#~ msgstr "Nicht initialisiert"
-
-#~ msgid "Data upload failed for unknown reason"
-#~ msgstr "Hochladen der Daten aus unbekanntem Grund fehlgeschlagen"
+#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
+#~ msgstr ""
+#~ "Sie können die Maus oder Strg+Pfeiltasten benutzen um zu zoomen und zu "
+#~ "verschieben."
Index: applications/editors/josm/i18n/po/el.po
===================================================================
--- applications/editors/josm/i18n/po/el.po	(revision 16008)
+++ applications/editors/josm/i18n/po/el.po	(revision 16009)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-14 16:51+0200\n"
-"PO-Revision-Date: 2009-06-09 18:02+0000\n"
-"Last-Translator: alichani <alichani@yahoo.co.uk>\n"
+"POT-Creation-Date: 2009-06-19 21:52+0200\n"
+"PO-Revision-Date: 2009-06-16 18:09+0000\n"
+"Last-Translator: logictheo <towardsoss@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-06-14 14:45+0000\n"
+"X-Launchpad-Export-Date: 2009-06-19 19:33+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 "Βοήθεια"
 
 #: ../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 "Η προβολή δεν μπόρεσε να διαβαστεί από τις προτιμήσεις. Χρήση Mercator"
 
@@ -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"
@@ -462,4 +464,5 @@
 msgid "Please select exactly three nodes or one way with exactly three nodes."
 msgstr ""
+"Παρακαλώ επιλέξτε ακριβώς 3 κόμβους ή ένας δρόμος με ακριβώς 3 κόμβους."
 
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:121
@@ -530,5 +533,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 +603,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:92
-msgid "Email"
-msgstr "Email"
+msgid "E-Mail"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:96
@@ -637,12 +640,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 +674,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
@@ -701,16 +706,13 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:207
 #, java-format
-msgid "Helppage missing. Create it in <A HREF=\"{0}\">english</A>."
-msgstr ""
-"Η σελίδα βοήθειας λείπει. Δημιουργήστε την στα <A HREF=\"{0}\">αγγλικά</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 ""
-"Η σελίδα βοήθειας λείπει. Δημιουργήστε την στα <A HREF=\"{0}\">αγγλικά</A> ή "
-"<A HREF=\"{1}\">στη γλώσσα σας</A>."
 
 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:26
@@ -919,4 +921,6 @@
 msgid "Please select one or more closed ways of at least four nodes."
 msgstr ""
+"Παρακαλώ επιλέξτε έναν ή περισσότερους κλειστούς δρόμους από τουλάχιστον "
+"τέσσερις κόμβους."
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88
@@ -1136,13 +1140,13 @@
 msgstr "Βοήθεια: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:99
 msgid "Status Report"
 msgstr "Αναφορά Κατάστασης"
 
-#: ../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 "Αντιγραφή στο πρόχειρο και κλείσιμο"
 
-#: ../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
@@ -1177,5 +1181,9 @@
 "way also."
 msgstr[0] ""
+"Υπάρχουν περισσότερους από έναν δρόμο που χρησιμοποιεί τον κόμβο που "
+"επιλέξατε. Παρακαλώ επιλέξτε και τον δρόμο."
 msgstr[1] ""
+"Υπάρχουν περισσότερους από έναν δρόμο που χρησιμοποιεί τους κόμβους που "
+"επιλέξατε. Παρακαλώ επιλέξτε και τον δρόμο."
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:138
@@ -1260,5 +1268,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114
 msgid "* One node that is used by more than one way, or"
-msgstr ""
+msgstr "* Ένας κόμβος που χρησιμοποιείται από παραπάνω από έναν δρόμο, ή"
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115
@@ -1329,12 +1337,10 @@
 msgstr ""
 
-#: ../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 "Ενημέρωση Δεδομένων"
 
-#: ../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 ""
@@ -1342,5 +1348,5 @@
 "λήψη δεδομένων)"
 
-#: ../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?"
@@ -1349,88 +1355,258 @@
 "δεδομένων;"
 
-#: ../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 ""
-"Αυτή η ενέργεια θα απαιτήσει {0} επιμέρους αιτήσης λήψης. Θέλετε να "
-"συνεχίσετε;"
-
-#: ../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 "Αποστολή προς OSM..."
 
-#: ../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 "Αποστολή όλων των αλλαγών στον δακομιστή του OSM."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:96
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:94
 msgid "Objects to add:"
 msgstr "Αντικείμενα που θα προστεθούν:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102
 msgid "Objects to modify:"
 msgstr "Αντικείμενα που θα αλλαχτούν"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:110
 msgid "Objects to delete:"
 msgstr "Αντικείμενα που θα διαγραφούν:"
 
-#: ../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 "Παρέχετε ένα σύντομο σχόλιο για τις αλλαγές που αποστέλλετε:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:126
 msgid "Upload these changes?"
 msgstr "Να αποσταλούν αυτές οι αλλαγές;"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:130
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
 msgid "Upload Changes"
 msgstr "Αποστολή Αλλαγών"
 
-#: ../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 "Τίποτα για αποστολή. Κάντε λήψη δεδομένων πρώτα."
 
-#: ../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 "Υπάρχουν ανεπίλυτες διενέξεις. Πρέπει να τις επιλύσετε πρώτα."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:182
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:180
 msgid "No changes to upload."
 msgstr "Δεν υπάρχουν αλλαγές προς αποστολή"
 
-#: ../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 ""
@@ -1535,37 +1711,51 @@
 msgstr "Ακατέργαστα δεδομένα GPS"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:44
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:46
 msgid "Downloading data"
 msgstr "Λήψη δεδομένων"
 
-#: ../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 "Δεν εισήχθησαν δεδομένα"
 
-#: ../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 "Επίπεδο Δεδομένων {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 "Δεδομένα OpenStreetMap"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:37
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:45
 msgid "Data Layer"
 msgstr "Επίπεδο δεδομένων"
 
-#: ../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 "Λήψη {0} από {1} (απομένουν {2})"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:88
-msgid "The following errors occured during mass download:"
-msgstr "Τα παρακάτω σφάλματα συνέβησαν κατά την μαζική λήψη:"
-
-#: ../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 "Σφάλματα κατά την λήψη"
+
+#: ../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
@@ -1616,34 +1806,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 "Προσθήκη κόμβου"
 
-#: ../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 ""
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:500
+msgid "Connect existing way to node"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:502
-msgid "Connect existing way to node"
+msgid "Add a new node to an existing way"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:504
-msgid "Add a new node to an existing way"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:506
 msgid "Add node into way and connect"
 msgstr ""
 
-#: ../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 "Δημιοθργία νέου κόμβου."
 
-#: ../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 "Επιλογή κόμβου στο σημείο του κέρσορα."
 
-#: ../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."
@@ -1652,14 +1842,14 @@
 msgstr[1] ""
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:897
+msgid "Start new way from last node."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:899
-msgid "Start new way from last node."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:901
 msgid "Continue way from last node."
 msgstr ""
 
-#: ../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 "Τέλος σχεδιασμού."
@@ -1978,25 +2168,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 "Φόρτωση επιλογής"
 
-#: ../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 "Επικοινωνήστε με {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:45
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:46
 msgid "Downloading..."
 msgstr "Λήψη..."
 
-#: ../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 "Αδυναμία ανάγνωσης από το URL: \"{0}\""
 
-#: ../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 ""
 
@@ -2058,13 +2254,85 @@
 msgstr "Επίλυση {0} διενέξεων σε {1} αντικείμενα"
 
-#: ../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 "Διαγραφή {1} {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97
+#, java-format
+msgid "Delete {0} {1}"
+msgstr "Διαγραφή {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153
+msgid "Conflicting relation"
+msgstr "Αντικρουόμενη σχέση"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147
+#, java-format
+msgid ""
+"Selection \"{0}\" is used by relation \"{1}\" with role {2}.\n"
+"Delete from relation?"
+msgstr ""
+"Η επιλογή \"{0}\" χρησιμοποιείται από την σχέση \"{1}\" με ρόλο {2}.\n"
+"Διαγραφή από την σχέση;"
+
+#: ../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 ""
+"Η επιλογή \"{0}\" χρησιμοποιείτε από την σχέση \"{1}\"\n"
+"Διαγραφή απο την σχέση;"
+
+#: ../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 ""
+"Πρόκειτε να διαγράψετε κόμβους εκτός της περιοχής που λάβατε.<br> Αυτό "
+"μπορεί να δημιουργήσει προβλήματα γιατί άλλα αντικείμενα (που δεν βλέπετε) "
+"μπορεί να τους χρησιμοποιούν.<br>Είστε σίγουροι οτι επιθυμείτε διαγραφή;"
+
+#: ../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 "Μετακίνηση"
+
 #: ../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"
@@ -2073,10 +2341,219 @@
 msgstr[1] "κόμβοι"
 
-#: ../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 "Ακολουθία"
+
+#: ../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 "Αδυναμία ανοίγματος φακέλου προτιμήσεων: {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 ""
+"Το αρχείο προτιμήσεων είχε σφάλματα. Δημιουργείται αντίγραφο ασφαλείας στο "
+"{0}."
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:79
+#, java-format
+msgid "Preferences stored on {0}"
+msgstr "Οι προτιμήσεις αποθηκεύθηκαν στο {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:82
+#, java-format
+msgid "Could not upload preferences. Reason: {0}"
+msgstr "Αδυναμία αποστολής προτιμήσεων. Λόγος: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:93
+msgid "Could not load preferences from server."
+msgstr "Αδυναμία φόρτωσης προτιμήσεων από διακομηστή"
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:34
+msgid "different"
+msgstr "διαφορετικά"
+
+#: ../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 "Σφάλμα: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
+#, java-format
+msgid "Warning: {0}"
+msgstr "Προειδοποίηση: {0}"
+
+#: ../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"
@@ -2085,8 +2562,10 @@
 msgstr[1] ""
 
-#: ../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
@@ -2097,265 +2576,27 @@
 msgstr[1] "σχέσεις"
 
-#: ../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 "Διαγραφή {1} {0}"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97
-#, java-format
-msgid "Delete {0} {1}"
-msgstr "Διαγραφή {0} {1}"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153
-msgid "Conflicting relation"
-msgstr "Αντικρουόμενη σχέση"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147
-#, java-format
-msgid ""
-"Selection \"{0}\" is used by relation \"{1}\" with role {2}.\n"
-"Delete from relation?"
-msgstr ""
-"Η επιλογή \"{0}\" χρησιμοποιείται από την σχέση \"{1}\" με ρόλο {2}.\n"
-"Διαγραφή από την σχέση;"
-
-#: ../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 ""
-"Η επιλογή \"{0}\" χρησιμοποιείτε από την σχέση \"{1}\"\n"
-"Διαγραφή απο την σχέση;"
-
-#: ../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 ""
-"Πρόκειτε να διαγράψετε κόμβους εκτός της περιοχής που λάβατε.<br> Αυτό "
-"μπορεί να δημιουργήσει προβλήματα γιατί άλλα αντικείμενα (που δεν βλέπετε) "
-"μπορεί να τους χρησιμοποιούν.<br>Είστε σίγουροι οτι επιθυμείτε διαγραφή;"
-
-#: ../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 "Μετακίνηση"
-
-#: ../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 "Ακολουθία"
-
-#: ../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 "Αδυναμία ανοίγματος φακέλου προτιμήσεων: {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 ""
-"Το αρχείο προτιμήσεων είχε σφάλματα. Δημιουργείται αντίγραφο ασφαλείας στο "
-"{0}."
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:79
-#, java-format
-msgid "Preferences stored on {0}"
-msgstr "Οι προτιμήσεις αποθηκεύθηκαν στο {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:82
-#, java-format
-msgid "Could not upload preferences. Reason: {0}"
-msgstr "Αδυναμία αποστολής προτιμήσεων. Λόγος: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:93
-msgid "Could not load preferences from server."
-msgstr "Αδυναμία φόρτωσης προτιμήσεων από διακομηστή"
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:34
-msgid "different"
-msgstr "διαφορετικά"
-
-#: ../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 "Σφάλμα: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
-#, java-format
-msgid "Warning: {0}"
-msgstr "Προειδοποίηση: {0}"
-
-#: ../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"
@@ -2369,5 +2610,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:122
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "railway"
 msgstr "σιδηρόδρομος"
@@ -2389,4 +2630,62 @@
 msgstr[1] "{0} κόμβοι"
 
+#: ../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."
@@ -2534,5 +2833,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 "φόντο"
@@ -2615,8 +2914,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
@@ -2628,7 +2927,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
@@ -2731,10 +3030,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 "Όνομα χρήστη"
 
 #: ../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 "Κωδικός"
@@ -2832,22 +3131,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:146
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148
 msgid "File"
 msgstr "Αρχείο"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150
 msgid "View"
 msgstr "Προβολή"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:149
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151
 msgid "Tools"
 msgstr "Εργαλεία"
 
-#: ../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 "Προεπιλογές"
 
-#: ../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
@@ -2860,21 +3159,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 ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:218
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221
 msgid "Toggle Wireframe view"
 msgstr ""
 
-#: ../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 "Ήχος"
@@ -2946,6 +3245,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 "το επίπεδο δεν είναι στη λίστα."
@@ -2955,9 +3254,9 @@
 msgstr "Επικοινωνία με τον διακομιστή OSM..."
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:104
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:105
 msgid "Error while parsing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:107
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:108
 msgid "File not found"
 msgstr "Το αρχείο δεν βρέθηκε"
@@ -3029,5 +3328,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 "Μέλη"
@@ -3223,5 +3522,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
@@ -3303,5 +3602,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 ""
@@ -3340,5 +3639,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 ""
 
@@ -3392,5 +3691,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 "Ρόλος"
@@ -3494,5 +3793,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
@@ -3807,5 +4106,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 "Σχέσεις"
@@ -3913,66 +4212,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 "Βασικό"
 
-#: ../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 "Κατεχόμενο από"
 
-#: ../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 "Ετικέτες (κενή τιμή διαγράφει την ετικέτα)"
 
-#: ../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 "Μετακίνηση των επιλεγμένων μελών πάνω"
 
-#: ../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 "Προσθήκη επιλεγμένων"
 
-#: ../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 "Προσθήκη επιλεγμένων αντικειμένων ως μέλη"
 
-#: ../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 "Αφαίρεση Επιλεγμένων"
 
-#: ../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 "Αφαίρεση όλων των επιλεγμένων αντικειμένων από την σχέση"
 
-#: ../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 "Μετακίνηση των επιλεγμένων μελών κάτω"
 
-#: ../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 "Αφαίρεση του μέλους στην τρέχουσα σειρά του πίνακα από αυτήν την σχέση"
 
-#: ../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 "Λήψη μελών"
 
-#: ../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 ""
@@ -4017,5 +4316,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
@@ -4036,9 +4335,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
@@ -4060,31 +4359,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 "Μέλη: {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 "Επεξεργαστής Σχέσεων: {0}"
 
-#: ../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 "Υπήρχαν συγκρούσεις στην εισαγωγή"
 
-#: ../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 "Σφάλμα κατά την ανάλυση της απάντησης του διακομιστή."
 
-#: ../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 "Αδυναμία σύνδεσης με το διακομιστή"
+
+#: ../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
@@ -4150,13 +4452,13 @@
 msgstr "Πηγές και Τύποι δεδομένων"
 
-#: ../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 "Λήψη σαν νέο επίπεδο"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:174
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:173
 msgid "Download Area"
 msgstr "Λήψη Περιοχής"
 
-#: ../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 ""
@@ -4164,5 +4466,5 @@
 "διακομιστή"
 
-#: ../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 ""
@@ -4191,5 +4493,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 "Τοποθεσίες"
@@ -4236,21 +4538,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 "τύπος"
@@ -4290,14 +4592,4 @@
 msgid "Tile Numbers"
 msgstr "Αριθμοί πλακιδίων"
-
-#: ../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 ""
-
-#. 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 "Χάρτης"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:98
@@ -4376,5 +4668,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)"
@@ -4490,14 +4782,14 @@
 msgstr "Αρχεία Κυματομορφής (*.wav)"
 
-#: ../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 "Σημάδια ήχου από {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244
 msgid "Import images"
 msgstr "Εισαγωγή εικόνων"
 
-#: ../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, "
@@ -4506,5 +4798,5 @@
 msgstr[1] "{0} τροχιές, "
 
-#: ../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, "
@@ -4513,5 +4805,5 @@
 msgstr[1] "{0} διαδρομές, "
 
-#: ../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"
@@ -4520,28 +4812,28 @@
 msgstr[1] "{0} σημεία αναφοράς"
 
-#: ../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 "Όνομα: {0}"
 
-#: ../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 "Περιγραφή: {0}"
 
-#: ../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 "Μετατροπή σε επίπεδο δεδομένων"
 
-#: ../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 ""
@@ -4552,11 +4844,11 @@
 "βλαβερή.<br>Αν θέλετε να αποστείλετε ίχνη, κοιτάξτε εδώ:"
 
-#: ../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
@@ -4566,29 +4858,29 @@
 msgstr "Μετατράπηκε από: {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 "Λήψη από OSM κατά μηκός αυτού του ίχνους"
 
-#: ../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 "{0} μέτρα"
 
-#: ../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 "{0} τετρ. χλμ"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:822
 #, java-format
 msgid ""
@@ -4599,10 +4891,10 @@
 "συνεχίσετε;</html>"
 
-#: ../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 ""
 "Δεν υπάρχει διαθέσιμο ίχνος GPX  στο επίπεδο για την συσχέτιση με τον ήχο."
 
-#: ../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 "
@@ -4610,5 +4902,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 "
@@ -4616,33 +4908,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 "το {0} αποτελείται από:"
 
-#: ../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} διαγράφηκαν.)"
 
-#: ../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"
@@ -4650,21 +4951,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"
@@ -4811,5 +5112,5 @@
 "χρησιμοποιηθεί ακόμα)."
 
-#: ../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
@@ -4818,5 +5119,5 @@
 msgstr "Παρακαλώ επιλέξτε την γραμμή για επεξεργασία."
 
-#: ../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
@@ -4824,5 +5125,5 @@
 msgstr "Νέα τιμή για {0}"
 
-#: ../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
@@ -4832,5 +5133,5 @@
 msgstr "Παρακαλώ επιλέξτε την γραμμή για διαγραφή."
 
-#: ../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 "Εισάγεται ένα νέο ζεύγος κλειδιού/τιμής"
@@ -5709,106 +6010,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 "Όνομα"
@@ -6277,6 +6578,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:36
-msgid "Login name (email) to the OSM account."
-msgstr "Όνομα χρήστη (email) για τον λογαριασμό OSM."
+msgid "Login name (e-mail) to the OSM account."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
@@ -6292,6 +6593,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
-msgid "OSM username (email)"
-msgstr "Όνομα χρήστη OSM (email)"
+msgid "OSM username (e-mail)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
@@ -6302,5 +6603,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 ""
@@ -6597,6 +6898,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 "Επικοινωνία με τον διακομιστή OSM"
@@ -6607,7 +6909,7 @@
 msgstr "Μεταφόρτωση σημείων {0} ως {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 "Μεταφόρτωση δεδομένων OSM..."
@@ -6672,15 +6974,14 @@
 msgstr "Αποτυχία εισαγωγής NMEA!"
 
-#: ../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 ""
@@ -6689,31 +6990,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 "Άνοιγμα πακέτου αλλαγών..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:351
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298
 msgid "Closing changeset..."
 msgstr "Κλείσιμο πακέτου αλλαγών"
 
-#: ../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 "Προετοιμασία..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:381
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:326
 msgid "Uploading..."
 msgstr "Αποστολή..."
@@ -6728,25 +7035,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 "Λανθασμένος κωδικός ή όνομα χρήστη"
 
-#: ../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 "Προειδοποίηση: Ο κωδικός μεταδίδεται χωρίς κρυπτογράφηση"
 
-#: ../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 "Αποθήκευση χρήστη και κωδικού (χωρίς κρυπτογράφηση)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:89
 msgid "Enter Password"
 msgstr "Εισάγετε κωδικό"
 
-#: ../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..."
@@ -6757,4 +7064,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."
@@ -6847,9 +7197,23 @@
 msgstr "Κακοσχηματισμένο id κόμβου"
 
-#: ../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 "Επικοινωνία με τον Διακομιστή..."
 
-#: ../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."
@@ -6858,17 +7222,9 @@
 "Internet."
 
-#: ../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 ""
-"Ο διακομιστής επέστρεψε εσωτερικό σφάλμα. Δοκιμάστε μια μικρότερη περιοχή ή "
-"ξαναδοκιμάστε αργότερα."
-
-#: ../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 ""
 
@@ -6884,5 +7240,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 "Λήψη Πρόσθετων"
@@ -7076,9 +7432,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 "Λήψη πρόσθετων που λείπουν"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:128
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:119
 #, java-format
 msgid ""
@@ -7091,6 +7447,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
@@ -7113,35 +7469,35 @@
 msgstr "άγνωστο"
 
-#: ../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}: Έκδοση {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 "Πρόσθετα που έρχονται με το JOSM"
 
-#: ../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 "Σφάλμα κατά την ανάγνωση αρχείου πληροφοριών πρόσθετου: {0}"
 
-#: ../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 "Αυτό είναι το μετά το τέλος της εγγραφής"
 
-#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:329
+#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:340
 msgid "Error playing sound"
 msgstr "Σφάλμα στην αναπαραγωγή ήχου"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
 msgid "Do nothing"
 msgstr "Καμία ενέργεια"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
 msgid "Report Bug"
 msgstr "Αναφέρετε Bug"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:52
 msgid ""
 "An unexpected exception occurred.\n"
@@ -7156,19 +7512,19 @@
 "για bug."
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55
 msgid "Unexpected Exception"
 msgstr "Μη Αναμενόμενη Εξαίρεση"
 
-#: ../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 "Παρακαλώ αναφέρετε ένα δελτίο στο {0}"
 
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:67
+msgid "Include your steps to get to the error (as detailed as possible)!"
+msgstr ""
+"Συμπεριλάβετε τα βήματα ποθ οδήγησαν στο σφάλμα (όσο πιο λεπτομερώς γίνεται)!"
+
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:68
-msgid "Include your steps to get to the error (as detailed as possible)!"
-msgstr ""
-"Συμπεριλάβετε τα βήματα ποθ οδήγησαν στο σφάλμα (όσο πιο λεπτομερώς γίνεται)!"
-
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69
 msgid ""
 "Try updating to the newest version of JOSM and all plugins before reporting "
@@ -7178,9 +7534,9 @@
 "πρόσθετων πριν αναφέρετε bug."
 
-#: ../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 "Βεβαιωθείτε ότι συμπεριλάβατε τις ακόλουθεσ πληροφορίες:"
 
-#: ../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 "(Το κείμενο έχει ήδη αντιγραφεί στο πρόχειρο σας.)"
@@ -7265,5 +7621,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 "Περιγραφή"
@@ -7636,5 +7992,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 ""
@@ -7668,5 +8024,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"
@@ -7689,5 +8044,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
@@ -7778,6 +8133,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/"
@@ -7857,6 +8212,6 @@
 msgstr "Προσθήκη \"source=...\" στα στοιχεία;"
 
-#: ../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
@@ -7864,11 +8219,11 @@
 msgstr "Λήψη {0}"
 
-#: ../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 "Επικοινωνία με διακομιστή WMS..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:157
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:158
 msgid "Create buildings"
 msgstr "Δημιουργία κτηρίων"
@@ -7885,13 +8240,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 "Δημιουργία ορίου"
@@ -7912,5 +8267,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 ""
 
@@ -8006,5 +8361,5 @@
 "Επιλέξτε ένα από αυτά πρώτα και μετά ξαναπροσπαθήστε"
 
-#: ../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
@@ -8012,59 +8367,28 @@
 msgstr "Άδειο επίπεδο"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:176
 #, java-format
 msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr "Επίπεδο WMS ({0}), {1} πλακίδιο(α) φορτώθηκαν"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:183
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:178
 msgid "Is not vectorized."
 msgstr "Δεν είναι διανυσματικό."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:179
 #, java-format
 msgid "Raster center: {0}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181
 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 "Αποθ'ηκευση επιπέδου WMS σε αρχείο"
-
-#: ../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 "Φόρτωση επιπέδου WMS από αρχείο"
-
-#: ../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 "Μη υποστηριζόμενη έκδοση αρχείου WMS΄ βρέθηκε {0}, αναμενόταν {1}"
-
-#: ../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 ""
@@ -8073,14 +8397,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 ""
@@ -8175,11 +8499,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 ""
@@ -8189,5 +8513,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 ""
@@ -8475,4 +8799,8 @@
 msgid "Lakewalker trace"
 msgstr "Ίχνος Lakewalker"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:10
+msgid "An unknown error has occurred"
+msgstr ""
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
@@ -8793,42 +9121,42 @@
 msgstr "LiveGPS"
 
-#: ../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 "Επίπεδο για την λήψη μετρήσεων"
@@ -8887,6 +9215,6 @@
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
-msgid "Open the OpenStreetBugs window and activate the automatic download"
-msgstr "Άνοιγμα του παραθύρου OpenStreetBugs και ενεργοποίηση αυτόματης λήψης"
+msgid "Opens the OpenStreetBugs window and activates the automatic download"
+msgstr ""
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:123
@@ -8963,5 +9291,5 @@
 msgstr "Osmarender"
 
-#: ../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 "
@@ -8971,9 +9299,9 @@
 "σελίδα Ρυθμίσεις Χάρτη από τις επιλογές."
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:123
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:127
 msgid "osmarender options"
 msgstr "επιλογές osmarender"
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:124
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:128
 msgid "Firefox executable"
 msgstr "εκτελέσιμο Firefox"
@@ -9400,5 +9728,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 "Όνομα οδού"
@@ -9488,5 +9816,5 @@
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:195
-msgid "No intersections found. Nothing was changed."
+msgid "No intersection found. Nothing was changed."
 msgstr ""
 
@@ -10353,19 +10681,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 "Βοήθεια πρόσθετου WMS"
@@ -10424,5 +10751,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113
 #, java-format
 msgid ""
@@ -10466,4 +10793,29 @@
 msgid "Alpha channel"
 msgstr "Κανάλι άλφα"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
+msgid "Save WMS layer to file"
+msgstr "Αποθ'ηκευση επιπέδου WMS σε αρχείο"
+
+#: ../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 "Φόρτωση επιπέδου WMS από αρχείο"
+
+#: ../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 "Μη υποστηριζόμενη έκδοση αρχείου WMS΄ βρέθηκε {0}, αναμενόταν {1}"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:335
+msgid "File Format Error"
+msgstr "Σφάλμα μορφής αρχείου"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:163
@@ -10558,4 +10910,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 ""
@@ -10570,5 +10927,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 ""
 
@@ -10852,5 +11209,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 ""
@@ -11352,5 +11709,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 "Πλάτος (μέτρα)"
@@ -11819,7 +12176,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 "Τύπος"
@@ -12435,10 +12792,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 "Λειτουργός"
@@ -12650,7 +13007,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 "Υψόμετρο"
@@ -13582,5 +13939,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 "Κόστος"
@@ -13716,5 +14073,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 ""
@@ -13722,5 +14079,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 ""
@@ -13772,11 +14129,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 ""
@@ -13784,5 +14151,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1512
+#: build/trans_presets.java:1513
 msgid "Taxi"
 msgstr "Ταξί"
@@ -13790,5 +14157,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 "Επεξεργασία σταθμού ταξί"
@@ -13796,5 +14163,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1519
+#: build/trans_presets.java:1520
 msgid "Airport"
 msgstr "Αεροδρόμιο"
@@ -13802,15 +14169,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 "IATA"
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1527
+#: build/trans_presets.java:1528
 msgid "ICAO"
 msgstr "ICAO"
@@ -13819,5 +14186,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1532
+#: build/trans_presets.java:1533
 msgid "Accomodation"
 msgstr "Διαμονή"
@@ -13829,5 +14196,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 "Ξενοδοχείο"
@@ -13836,15 +14203,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 ""
@@ -13852,20 +14219,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 "Σαλέ"
@@ -13873,10 +14240,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 ""
@@ -13884,30 +14251,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 "Χώρος Κάμπινγκ"
@@ -13915,10 +14282,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 "Φαγητό+Ποτά"
@@ -13929,5 +14296,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 "Εστιατόριο"
@@ -13935,5 +14302,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 "Επεξεργασία Εστιατορίου"
@@ -13941,5 +14308,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 "Κουζίνα"
@@ -13947,61 +14314,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 "pizza"
 
-#: 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 "Fast Food"
@@ -14009,9 +14376,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 "Επεξεργασία Εστιατορίου Fast Food"
 
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1598
 msgid "Cafe"
 msgstr "Καφέ"
@@ -14019,10 +14386,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 "Pub"
@@ -14030,20 +14397,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 "Επεξεργασία Pub"
 
 #. 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 "Μπαρ"
@@ -14051,10 +14418,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 "Νυχτερινό Κέντρο"
@@ -14062,20 +14429,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 ""
@@ -14084,11 +14451,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 "Μουσείο"
@@ -14096,10 +14463,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 "Ζωολογικός Κήπος"
@@ -14108,10 +14475,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 ""
@@ -14119,25 +14486,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 ""
@@ -14145,5 +14512,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 ""
@@ -14151,5 +14518,5 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1667
 msgid "Information Office"
 msgstr "Γραφείο Πληροφοριών"
@@ -14157,83 +14524,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 "Χάρτης"
+
 #. 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 ""
@@ -14241,25 +14605,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 "Κάστρο"
@@ -14268,20 +14632,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 "Αρχαιολογικός Χώρος"
@@ -14290,10 +14654,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 "Πεδίο Μάχης"
@@ -14301,5 +14665,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 "Επεξεργασία Πεδίου Μάχης"
@@ -14307,15 +14671,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 "Ηρώο"
@@ -14323,45 +14687,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 "Παιδική Χαρά"
@@ -14369,15 +14733,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 ""
@@ -14385,15 +14749,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 "Επεξεργασία Σταδίου"
@@ -14407,6 +14771,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 "επιλέξτε άθλημα:"
@@ -14782,6 +15146,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
@@ -14814,227 +15178,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 "baseball"
 
-#: 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 "cricket"
 
-#: 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 "golf"
 
-#: 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 "rugby"
 
-#: 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 "Μίνι Golf"
 
 #. item
-#: build/trans_presets.java:1826
+#: build/trans_presets.java:1827
 msgid "Edit Miniature Golf"
 msgstr "Επεξεργασία Μίνι Golf"
 
 #. 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 ""
@@ -15073,191 +15437,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 ""
@@ -15265,56 +15629,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 "Δυσκολία"
 
 #. 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 "εύκολη"
 
-#: 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 ""
 
-#: 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 "Σκοποβολή"
@@ -15322,178 +15686,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 "Baseball"
 
 #. item
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:1960
 msgid "Edit Baseball"
 msgstr "Επεξεργασία Baseball"
 
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:1965
 msgid "Basketball"
 msgstr "Καλαθοσφαίρηση"
 
 #. item
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:1966
 msgid "Edit Basketball"
 msgstr "Επεξεργασία Καλαθοσφαίρησης"
 
-#: 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 "Επεξεργασία Golf"
 
 #. 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 ""
 
 #. item
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:1990
 msgid "Edit Cricket"
 msgstr ""
 
-#: 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 "Hockey"
 
 #. item
-#: build/trans_presets.java:2007
+#: build/trans_presets.java:2008
 msgid "Edit Hockey"
 msgstr "Επεξεργασία Hockey"
 
-#: 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 "Rugby"
 
 #. item
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2026
 msgid "Edit Rugby"
 msgstr "Επεξεργασία Rugby"
 
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:2031
 msgid "Table Tennis"
 msgstr "Επιτραπέζια Αντισφαίριση"
 
 #. item
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2032
 msgid "Edit Table Tennis"
 msgstr "Επεξεργασία Επιτραπέζιας Αντισφαίρισης"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2037
 msgid "Tennis"
 msgstr "Αντισφαίριση"
 
 #. item
-#: build/trans_presets.java:2037
+#: build/trans_presets.java:2038
 msgid "Edit Tennis"
 msgstr "Επεξεργασία Αντισφαίρισης"
 
 #. <separator/>
-#: build/trans_presets.java:2044
+#: build/trans_presets.java:2045
 msgid "Buildings"
 msgstr "Κτήρια"
 
 #. group "Buildings"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2046
 msgid "Building"
 msgstr "Κτήριο"
@@ -15501,5 +15865,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2049
 msgid "Public Building"
 msgstr "Δημόσιο Κτήριο"
@@ -15507,10 +15871,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 "Δημαρχείο"
@@ -15518,10 +15882,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 "Επεξεργασία Δημαρχείου"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2061
 msgid "Embassy"
 msgstr "Πρεσβεία"
@@ -15529,10 +15893,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 "Επεξεργασία Πρεσβείας"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2066
+#: build/trans_presets.java:2067
 msgid "Courthouse"
 msgstr "Δικαστήρια"
@@ -15541,10 +15905,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 "Επεξεργασία Δικαστηρίων"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2074
 msgid "Prison"
 msgstr "Φυλακή"
@@ -15553,10 +15917,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 "Επεξεργασία Φυλακής"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2080
+#: build/trans_presets.java:2081
 msgid "Police"
 msgstr "Αστυνομία"
@@ -15566,10 +15930,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 "Επεξεργασία Αστυνομίας"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2089
 msgid "Fire Station"
 msgstr "Πυροσβεστείο"
@@ -15578,10 +15942,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 "Επεξεργασία Πυροσβεστείου"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2096
 msgid "Post Office"
 msgstr "Ταχυδρομείο"
@@ -15589,5 +15953,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 "Επεξεργασία Ταχυδρομείου"
@@ -15595,15 +15959,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2103
 msgid "Kindergarten"
 msgstr "Νηπιαγωγίο"
 
 #. item
-#: build/trans_presets.java:2103
+#: build/trans_presets.java:2104
 msgid "Edit Kindergarten"
 msgstr "Επεξεργασία Νηπιαγωγίου"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2108
 msgid "School"
 msgstr "Σχολείο"
@@ -15611,10 +15975,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 "Επεξεργασία Σχολείου"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2114
 msgid "University"
 msgstr "Πανεπιστήμιο"
@@ -15622,10 +15986,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 "Επεξεργασία Πανεπιστημίου"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2120
 msgid "College"
 msgstr "Κολέγιο"
@@ -15633,5 +15997,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 "Επεξεργασία Κολεγίου"
@@ -15639,5 +16003,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2126
+#: build/trans_presets.java:2127
 msgid "Cinema"
 msgstr "Κινηματογράφος"
@@ -15646,10 +16010,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 "Επεξεργασία Κινηματογράφου"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2133
+#: build/trans_presets.java:2134
 msgid "Library"
 msgstr "Βιβλιοθήκη"
@@ -15658,10 +16022,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 "Επεξεργασία Βιβλιοθήκης"
 
 #. item "Buildings/Library" text "Name"
-#: build/trans_presets.java:2140
+#: build/trans_presets.java:2141
 msgid "Arts Centre"
 msgstr "Κέντρο Τεχνών"
@@ -15669,10 +16033,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 "Θέατρο"
@@ -15681,10 +16045,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 "Επεξεργασία Θεάτρου"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2154
 msgid "Place of Worship"
 msgstr "Τόπος Λατρείας"
@@ -15694,5 +16058,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 "Επεξεργασία Τόπου Λατρείας"
@@ -15701,6 +16065,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 "Θρησκεία"
@@ -15709,66 +16073,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 "βουδισμός"
 
-#: 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 "χριστιανισμός"
 
-#: 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 "ινδουϊσμός"
 
-#: 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 "ιουδαϊσμός"
 
-#: 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 "μουσουλμανισμός"
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 "ταοϊσμός"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2881
-#: build/trans_presets.java:2890
-msgid "unitarian"
-msgstr ""
-
-#: build/trans_presets.java:2160 build/trans_presets.java:2881
-#: build/trans_presets.java:2890
-msgid "zoroastrian"
-msgstr ""
-
 #: build/trans_presets.java:2161 build/trans_presets.java:2882
 #: build/trans_presets.java:2891
+msgid "unitarian"
+msgstr ""
+
+#: build/trans_presets.java:2161 build/trans_presets.java:2882
+#: build/trans_presets.java:2891
+msgid "zoroastrian"
+msgstr ""
+
+#: build/trans_presets.java:2162 build/trans_presets.java:2883
+#: build/trans_presets.java:2892
 msgid "Denomination"
 msgstr "Δόγμα"
@@ -15777,81 +16141,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 "αγγλικανικό"
 
-#: 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 "βαπτιστικό"
 
-#: 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 "καθολικό"
 
-#: 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 "ευαγγελικό"
 
-#: 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 "μαρτύρων του Ιεχοβά"
 
-#: 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 "λουθερανικό"
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 "ορθόδοξο"
 
-#: 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 "πεντηκωστής"
 
-#: 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 ""
 
-#: 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 "προτεσταντικό"
 
-#: 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 ""
 
-#: 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 "Διευθύνσεις"
@@ -15860,5 +16224,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 "Επεξεργασία διεύθυνσης"
@@ -15866,5 +16230,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2169
+#: build/trans_presets.java:2170
 msgid "House number"
 msgstr "Αριθμός σπιτιού"
@@ -15872,20 +16236,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2172
 msgid "House name"
 msgstr "Όνομα Σπιτιού"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2174
 msgid "City name"
 msgstr "Όνομα πόλης"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2174
+#: build/trans_presets.java:2175
 msgid "Post code"
 msgstr "Ταχυδρομικός Κώδικας"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2176
 msgid "Country code"
 msgstr "Κωδικός χώρας"
@@ -15893,5 +16257,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2179
 msgid "Address Interpolation"
 msgstr "Παρεμβολή Διευθύνσεων"
@@ -15900,5 +16264,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 "Επεξεργασία Παρεμβολής Διευθύνσεων"
@@ -15906,71 +16270,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 "Μονά"
 
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2184
 msgid "even"
 msgstr "Ζυγά"
 
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2184
 msgid "all"
 msgstr "όλα"
 
-#: 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 ""
 
 #. group "Man Made"
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2188
 msgid "Works"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2189
 msgid "Edit Works"
 msgstr ""
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2193
 msgid "Tower"
 msgstr "Πύργος"
 
 #. item
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2194
 msgid "Edit Tower"
 msgstr "Επεξεργασία Πύργου"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2198
 msgid "Water Tower"
 msgstr "Υδραγωγείο"
 
 #. item
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2199
 msgid "Edit Water Tower"
 msgstr "Επεξεργασία Υδραγωγείου"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2203
 msgid "Gasometer"
 msgstr "Μετρητής Αερίου"
 
 #. item
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2204
 msgid "Edit Gasometer"
 msgstr "Επεξεργασία Μετρητή Αερίου"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2207
+#: build/trans_presets.java:2208
 msgid "Lighthouse"
 msgstr "Φάρος"
@@ -15978,10 +16342,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 "Επεξεργασία Φάρου"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2214
 msgid "Windmill"
 msgstr "Ανεμόμυλος"
@@ -15989,10 +16353,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 "Επεξεργασία Ανεμόμυλου"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2220
 msgid "Pipeline"
 msgstr "Αγωγός"
@@ -16000,10 +16364,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 "Επεξεργασία Αγωγού"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2225
+#: build/trans_presets.java:2226
 msgid "Wastewater Plant"
 msgstr "Βιολογικός Καθαρισμός"
@@ -16013,10 +16377,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 "Γερανός"
@@ -16024,10 +16388,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 "Επεξεργασία Γερανού"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2239
+#: build/trans_presets.java:2240
 msgid "Beacon"
 msgstr "Φάρος"
@@ -16035,10 +16399,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 "Επεξεργασία Φάρου"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2245
+#: build/trans_presets.java:2246
 msgid "Survey Point"
 msgstr ""
@@ -16046,10 +16410,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 ""
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2252
 msgid "Surveillance"
 msgstr "Παρακολούθηση"
@@ -16057,5 +16421,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 "Επεξεργασία Κάμερας Παρακολούθησης"
@@ -16063,5 +16427,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2258
+#: build/trans_presets.java:2259
 msgid "Power Generator"
 msgstr "Γεννήτρια Ρεύματος"
@@ -16071,39 +16435,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 "Επεξεργασία Γεννήτριας Ρεύματος"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "wind"
 msgstr "Αέρας"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "hydro"
 msgstr "Νερό"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "fossil"
 msgstr ""
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "nuclear"
 msgstr "Πυρηνικό"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "coal"
 msgstr "Λιγνίτης"
 
-#: 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 "Αέριο"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2268
 msgid "Power Station"
 msgstr "Σταθμός Παραγωγής Ρεύματος"
@@ -16112,10 +16476,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 "Επεξεργασία Σταθμού Παραγωγής Ρεύματος"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2274
+#: build/trans_presets.java:2275
 msgid "Power Sub Station"
 msgstr "Υποσταθμός Ρεύματος"
@@ -16124,5 +16488,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 "Επεξεργασία Υποσταθμού Ρεύματος"
@@ -16130,12 +16494,12 @@
 #. 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 "Πυλώνασ Ρεύματος"
+msgstr "Πυλώνας Ρεύματος"
 
 #. item
@@ -16144,5 +16508,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 "Επεξεργασία Πυλώνα Ρεύματος"
@@ -16150,5 +16514,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 "Αγωγός Μεταφοράς Ρεύματος"
@@ -16157,25 +16521,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 "Τάση ρεύματος"
 
 #. 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 "Τουαλέτες"
@@ -16183,20 +16547,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 "Σημείωση"
 
 #. 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 "Τηλέφωνο"
@@ -16205,5 +16569,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 "Επεξεργασία Τηλεφώνου"
@@ -16211,5 +16575,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 "Κέρματα"
@@ -16217,5 +16581,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 "Χαρτονομίσματα"
@@ -16223,5 +16587,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 ""
@@ -16229,5 +16593,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 "Χρεωστικές Κάρτεσ"
@@ -16235,15 +16599,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 "Πιστωτικές Κάρτες"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2328
 msgid "Telephone cards"
 msgstr "Τηλεκάρτες"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2330
 msgid "Recycling"
 msgstr "Ανακύκλωση"
@@ -16252,5 +16616,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 "Επεξεργασία σταθμού Ανακύκλωσης"
@@ -16258,35 +16622,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 "Μπαταρίες"
 
 #. 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 "Ρούχα"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2338
 msgid "Glass"
 msgstr "Γυαλί"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2339
 msgid "Paper"
 msgstr "Χαρτί"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2340
 msgid "Scrap Metal"
 msgstr "Μέταλλα"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2342
 msgid "Bench"
 msgstr "Παγκάκι"
@@ -16295,20 +16659,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 ""
 
 #. item
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2347
 msgid "Edit Hunting Stand"
 msgstr ""
 
 #. item "Amenities/Hunting Stand" check "Shelter"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2350
 msgid "Hide"
 msgstr "Κρυψώνα"
 
 #. item "Amenities/Hunting Stand" check "Hide"
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2351
 msgid "Lock"
 msgstr "Κλειδαριά"
@@ -16316,22 +16680,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 "Ύψος"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2351
+#: build/trans_presets.java:2352
 msgid "low"
 msgstr "χαμηλό"
 
-#: build/trans_presets.java:2351
+#: build/trans_presets.java:2352
 msgid "half"
 msgstr "μισό"
 
-#: build/trans_presets.java:2351
+#: build/trans_presets.java:2352
 msgid "full"
 msgstr "πλήρες"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2354
 msgid "Fountain"
 msgstr "Συντριβάνι"
@@ -16340,10 +16704,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 "Επεξεργασία Συντριβανίου"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2361
 msgid "Drinking Water"
 msgstr "Πόσιμο Νερό"
@@ -16352,10 +16716,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 "Επεξεργασία πόσιμου νερού"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2367
+#: build/trans_presets.java:2368
 msgid "Baby Hatch"
 msgstr "Βρεφοδόχος"
@@ -16363,25 +16727,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 "Καταστήματα"
 
 #. 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 "Επεξεργασία Supermarket"
 
 #. item "Shops/Supermarket" text "Name"
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:2382
 msgid "Convenience Store"
 msgstr ""
@@ -16389,10 +16753,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 "Περίπτερο"
@@ -16400,10 +16764,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 "Επεξεργασία Περιπτέρου"
 
 #. item "Shops/Kiosk" text "Name"
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2394
 msgid "Vending machine"
 msgstr "Μηχάνημα Πώλησης"
@@ -16411,5 +16775,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 "Επεξεργασία Μηχανήματος Πώλησης"
@@ -16417,88 +16781,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 "εισητήρια Μέσων Μαζικής Μεταφοράς"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "public_transport_plans"
 msgstr "χάρτες Μέσων Μαζικής Μεταφοράς"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "parking_tickets"
 msgstr "εισιτήρια Στάθμευσης"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "food"
 msgstr "φαγητό"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "drinks"
 msgstr "ποτά"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "sweets"
 msgstr "γλυκά"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "cigarettes"
 msgstr "τσιγάρα"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "photos"
 msgstr "φωτογραφίες"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "animal_food"
 msgstr "τροφές ζώων"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "news_papers"
 msgstr "εφημερίδες"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "toys"
 msgstr "Παιχνίδια"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "stamps"
 msgstr "Γραμματόσημα"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "SIM-cards"
 msgstr "Κάρτες SIM"
 
-#: 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 "Προφυλακτικά"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "tampons"
 msgstr "tampons"
 
-#: 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 "Κρεοπωλείο"
@@ -16506,10 +16870,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 "Επεξεργασία Κρεοπωλείου"
 
 #. item "Shops/Butcher" text "Name"
-#: build/trans_presets.java:2414
+#: build/trans_presets.java:2415
 msgid "Baker"
 msgstr "Φούρνος"
@@ -16517,10 +16881,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 "Επεξεργασία Φούρνου"
 
 #. item "Shops/Baker" text "Name"
-#: build/trans_presets.java:2420
+#: build/trans_presets.java:2421
 msgid "Florist"
 msgstr "Ανθοπωλείο"
@@ -16528,20 +16892,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 "Επεξεργασία Ανθοπωλείου"
 
 #. 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 ""
@@ -16549,60 +16913,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 ""
 
 #. 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 "Υπολογιστές"
 
 #. item
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2444
 msgid "Edit Computer Shop"
 msgstr "Επεξεργασία Καταστήματος Υπολογιστών"
 
 #. item "Shops/Computer" text "Name"
-#: build/trans_presets.java:2447
+#: build/trans_presets.java:2448
 msgid "Electronics"
 msgstr "Ηλεκτρονικά"
 
 #. item
-#: build/trans_presets.java:2448
+#: build/trans_presets.java:2449
 msgid "Edit Electronics Shop"
 msgstr "Επεξεργασία Καταστήματος Ηλεκτρονικών"
 
 #. 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 "Έπιπλα"
 
 #. item
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2459
 msgid "Edit Furniture Shop"
 msgstr "Επεξεργασία Καταστήματος Επίπλων"
 
 #. item "Shops/Furniture" text "Name"
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2463
 msgid "Garden Centre"
 msgstr "Είδη Κήπου"
@@ -16610,10 +16974,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 "Επεξεργασία Καταστήματος Ειδών Κήπου"
 
 #. item "Shops/Garden Centre" text "Name"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2469
 msgid "Hardware"
 msgstr "Σιδηρικά"
@@ -16621,10 +16985,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 "Επεξεργασία Καταστήματος Σιδηρικών"
 
 #. item "Shops/Hardware" text "Name"
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2475
 msgid "Do-it-yourself-store"
 msgstr ""
@@ -16632,60 +16996,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 "Χαρτικά"
 
 #. item
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2482
 msgid "Edit Stationery Shop"
 msgstr "Επεξεργασία Χαρτοπωλείου"
 
 #. item "Shops/Stationery" text "Name"
-#: build/trans_presets.java:2485
+#: build/trans_presets.java:2486
 msgid "Hairdresser"
 msgstr "Κομμωτήριο"
 
 #. item
-#: build/trans_presets.java:2486
+#: build/trans_presets.java:2487
 msgid "Edit Hairdresser"
 msgstr "Επεξεργασία Κομμωτηρίου"
 
 #. item "Shops/Hairdresser" text "Name"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2491
 msgid "Shoes"
 msgstr "Υποδήματα"
 
 #. item
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2492
 msgid "Edit Shoe Shop"
 msgstr "Επεξεργασία Υποδηματοπωλείου"
 
 #. item "Shops/Shoes" text "Name"
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2496
 msgid "Toys"
 msgstr "Παιχνίδια"
 
 #. item
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2497
 msgid "Edit Toy Shop"
 msgstr "Επεξεργασία Καταστήματος Παιχνιδιών"
 
 #. item "Shops/Toys" text "Name"
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2501
 msgid "Video"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2502
 msgid "Edit Video Shop"
 msgstr ""
 
 #. item "Shops/Video" text "Name"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2506
 msgid "Dry Cleaning"
 msgstr "Στπγνοκαθαριστήριο"
@@ -16693,10 +17057,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 "Επεξεργασία Στεγνοκαθαριστηρίου"
 
 #. item "Shops/Dry Cleaning" text "Name"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2512
 msgid "Laundry"
 msgstr "Πλυντήριο"
@@ -16704,10 +17068,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 "Επεξεργασία πλυντηρίου"
 
 #. item "Shops/Laundry" text "Name"
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2518
 msgid "Outdoor"
 msgstr ""
@@ -16715,35 +17079,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 ""
 
 #. item "Shops/Outdoor" text "Name"
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2524
 msgid "Sports"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2525
 msgid "Edit Sports Shop"
 msgstr "Επεξεργασία Καταστήματος Αθλητικών"
 
 #. item "Shops/Sports" text "Name"
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2529
 msgid "Optician"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2530
 msgid "Edit Optician"
 msgstr ""
 
 #. item "Shops/Optician" text "Name"
-#: build/trans_presets.java:2535
+#: build/trans_presets.java:2536
 msgid "Cash"
 msgstr "Μετρητά"
 
 #. group "Cash"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2537
 msgid "Bank"
 msgstr "Τράπεζα"
@@ -16751,5 +17115,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 "Επεξεργασία Τράπεζας"
@@ -16757,10 +17121,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 "ΑΤΜ"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2544
 msgid "Money Exchange"
 msgstr "Συναλλακτήριο"
@@ -16768,5 +17132,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 "Επεξεργασία Συναλλακτηρίου"
@@ -16774,15 +17138,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 "Επεξεργασία ΑΤΜ"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2557
 msgid "Health"
 msgstr "Υγεία"
 
 #. group "Health"
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2558
 msgid "Doctors"
 msgstr "Ιατροί"
@@ -16790,20 +17154,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 "Επεξεργασία Ιατρών"
 
 #. item "Health/Doctors" text "Name"
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2564
 msgid "Dentist"
 msgstr "Οδοντίατρος"
 
 #. item
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2565
 msgid "Edit Dentist"
 msgstr "Επεξεργασία Οδοντιάτρου"
 
 #. item "Health/Dentist" text "Name"
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2569
 msgid "Pharmacy"
 msgstr "Φαρμακείο"
@@ -16811,5 +17175,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 "Επεξεργασία Φαρμακείου"
@@ -16817,10 +17181,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 ""
 
 #. item "Health/Pharmacy" text "Name"
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2576
 msgid "Hospital"
 msgstr "Νοσοκομείο"
@@ -16828,10 +17192,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 "Επεξεργασία Νοσοκομειου"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2582
 msgid "Emergency Access Point"
 msgstr ""
@@ -16840,5 +17204,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 ""
@@ -16847,20 +17211,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2588
 msgid "Point Number"
 msgstr "Αριθμός Σημείου"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2589
 msgid "Point Name"
 msgstr "Όνομα Σημείου"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2591
 msgid "Phone Number"
 msgstr "Αριθμός Τηλεφώνου"
 
 #. 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 "(Χρησιμοποιήστε διεθνή κωδικό, όπως +12-345-67890)"
@@ -16868,5 +17232,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 "Κτηνιατρίο"
@@ -16875,25 +17239,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 "Επεξεργασία Κτηνιατρίου"
 
 #. group "Places"
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2605
 msgid "Continent"
 msgstr "Ήπειρος"
 
 #. item
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2606
 msgid "Edit Continent"
 msgstr "Επεξεργασία Ηπείρου"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2611
 msgid "Country"
 msgstr "Χώρα"
 
 #. item
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2612
 msgid "Edit Country"
 msgstr "Επεξεργασία Χώρας"
@@ -16901,30 +17265,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 "Πολιτεία"
 
 #. item
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2618
 msgid "Edit State"
 msgstr "Επεξεργασία Πολιτείας"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2622
+#: build/trans_presets.java:2623
 msgid "Region"
 msgstr "Περιοχή"
 
 #. item
-#: build/trans_presets.java:2623
+#: build/trans_presets.java:2624
 msgid "Edit Region"
 msgstr "Επεξεργασία Περιοχής"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2628
+#: build/trans_presets.java:2629
 msgid "County"
 msgstr "Περιφέρεια"
 
 #. item
-#: build/trans_presets.java:2629
+#: build/trans_presets.java:2630
 msgid "Edit County"
 msgstr "Επεξεργασία Περιφέρειας"
@@ -16932,15 +17296,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2635
+#: build/trans_presets.java:2636
 msgid "City"
 msgstr "Πόλη"
 
 #. item
-#: build/trans_presets.java:2636
+#: build/trans_presets.java:2637
 msgid "Edit City"
 msgstr "Επεξεργασία Πόλης"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2641
+#: build/trans_presets.java:2642
 msgid "Town"
 msgstr "Κωμόπολη"
@@ -16948,10 +17312,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 "Επεξεργασία Κωμόπολης"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2649
 msgid "Suburb"
 msgstr "Προάστιο"
@@ -16959,25 +17323,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 "Επεξεργασία Προαστίου"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2656
 msgid "Village"
 msgstr "Χωριό"
 
 #. item
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2657
 msgid "Edit Village"
 msgstr "Επεξεργασία Χωριού"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2662
 msgid "Hamlet"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2663
 msgid "Edit Hamlet"
 msgstr ""
@@ -16985,5 +17349,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2669
 msgid "Locality"
 msgstr ""
@@ -16991,10 +17355,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 ""
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2676
 msgid "Island"
 msgstr "Νησί"
@@ -17002,5 +17366,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 "Επεξεργασία Νησιού"
@@ -17008,5 +17372,5 @@
 #. item "Places/Island" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2683
+#: build/trans_presets.java:2684
 msgid "Cave Entrance"
 msgstr "Είσοδος σπηλαίου"
@@ -17014,10 +17378,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 "Επεξεργασία εισόδου σπηλαίου"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2690
 msgid "Peak"
 msgstr "Κορυφή"
@@ -17025,10 +17389,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 "Επεξεργασία κορυφής"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2697
 msgid "Glacier"
 msgstr "Παγετώνας"
@@ -17036,10 +17400,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 "Επεξεργασία παγετώνα"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2703
+#: build/trans_presets.java:2704
 msgid "Volcano"
 msgstr "Ηφαίστειο"
@@ -17047,70 +17411,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 "Επεξεργασία ηφαιστείου"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2711
+#: build/trans_presets.java:2712
 msgid "Boundaries"
 msgstr "Όρια"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2713
 msgid "National"
 msgstr "Εθνικό"
 
 #. item
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2714
 msgid "Edit National Boundary"
 msgstr "Επεξεργασία Εθνικού Συνόρου"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2718
+#: build/trans_presets.java:2719
 msgid "Administrative"
 msgstr "Διοικητικό"
 
 #. item
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2720
 msgid "Edit Administrative Boundary"
 msgstr "Επεξεργασία Διοικητικού Ορίου"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2724
+#: build/trans_presets.java:2725
 msgid "Civil"
 msgstr "Πολιτικό"
 
 #. item
-#: build/trans_presets.java:2725
+#: build/trans_presets.java:2726
 msgid "Edit Civil Boundary"
 msgstr "Επεξεργασία Πολιτικού Ορίου"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2730
+#: build/trans_presets.java:2731
 msgid "Political"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:2732
 msgid "Edit Political Boundary"
 msgstr "Επεξεργασία Πολιτικού Ορίου"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2736
+#: build/trans_presets.java:2737
 msgid "National park"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2737
+#: build/trans_presets.java:2738
 msgid "Edit National Park Boundary"
 msgstr "Επεξεργασία Ορίου Εθνικού Δρυμού"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2744
 msgid "Land use"
 msgstr "Χρήση γής"
 
 #. group "Land use"
-#: build/trans_presets.java:2744
+#: build/trans_presets.java:2745
 msgid "Tree"
 msgstr "Δένδρο"
@@ -17119,15 +17483,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 "Επεξεργασία δένδρου"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2753
 msgid "Botanical Name"
 msgstr "Βοτανικό όνομα"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2755
 msgid "Wood"
 msgstr "Άλσος"
@@ -17136,5 +17500,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 "Επεξεργασία άλσους"
@@ -17142,17 +17506,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 "Κωνοφόρο"
 
-#: build/trans_presets.java:2760 build/trans_presets.java:2769
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
 msgid "deciduous"
 msgstr "φυλλοβόλα"
 
-#: build/trans_presets.java:2760 build/trans_presets.java:2769
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
 msgid "mixed"
 msgstr "Μικτό"
 
-#: build/trans_presets.java:2762
+#: build/trans_presets.java:2763
 msgid "Forest"
 msgstr "Δάσος"
@@ -17161,14 +17525,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 "Επεξεργασία Δάσους"
 
-#: build/trans_presets.java:2771
+#: build/trans_presets.java:2772
 msgid "Nature Reserve"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2773
 msgid "Edit Nature Reserve"
 msgstr ""
@@ -17176,25 +17540,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2777
+#: build/trans_presets.java:2778
 msgid "Scree"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:2779
 msgid "Edit Scree"
 msgstr ""
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2783
 msgid "Scrub"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2783
+#: build/trans_presets.java:2784
 msgid "Edit Scrub"
 msgstr ""
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2788
 msgid "Fell"
 msgstr ""
@@ -17202,10 +17566,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 ""
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2794
 msgid "Heath"
 msgstr ""
@@ -17213,5 +17577,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 ""
@@ -17219,5 +17583,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2801
 msgid "Farmyard"
 msgstr ""
@@ -17226,45 +17590,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 ""
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2808
+#: build/trans_presets.java:2809
 msgid "Farmland"
 msgstr "Χωράφι"
 
 #. item
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2810
 msgid "Edit Farmland Landuse"
 msgstr "Επεξεργασία Χωραφιού"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2814
+#: build/trans_presets.java:2815
 msgid "Meadow"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2816
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2820
+#: build/trans_presets.java:2821
 msgid "Vineyard"
 msgstr "Αμπελώνας"
 
 #. item
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2822
 msgid "Edit Vineyard Landuse"
 msgstr "Επεξεργασία Αμπελώνα"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2826
+#: build/trans_presets.java:2827
 msgid "Allotments"
 msgstr "Κλήροι"
 
 #. item
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:2828
 msgid "Edit Allotments Landuse"
 msgstr ""
@@ -17272,25 +17636,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2833
+#: build/trans_presets.java:2834
 msgid "Garden"
 msgstr "Κήπος"
 
 #. item
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2835
 msgid "Edit Garden"
 msgstr "Επεξεργασία Κήπου"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2838
+#: build/trans_presets.java:2839
 msgid "Grass"
 msgstr "Γρασίδι"
 
 #. item
-#: build/trans_presets.java:2839
+#: build/trans_presets.java:2840
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2845
 msgid "Village Green"
 msgstr ""
@@ -17298,10 +17662,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 ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:2852
 msgid "Common"
 msgstr ""
@@ -17309,20 +17673,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 ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2858
 msgid "Park"
 msgstr "Πάρκο"
 
 #. item
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:2859
 msgid "Edit Park"
 msgstr "Επεξεργασία Πάρκου"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2863
 msgid "Recreation Ground"
 msgstr "Χώρος αναψυχής"
@@ -17330,5 +17694,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 "Επεξεργασία χώρου αναψυχής"
@@ -17336,15 +17700,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2871
 msgid "Residential area"
 msgstr "Οικιστική περιοχή"
 
 #. item
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2872
 msgid "Edit Residential Landuse"
 msgstr "Επεξεργασία οικιστικής περιοχής"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2877
 msgid "Graveyard"
 msgstr "Νεκροταφείο"
@@ -17352,9 +17716,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 "Επεξεργασία Νεκροταφείου"
 
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:2885
 msgid "Cemetery"
 msgstr "Κοιμητήριο"
@@ -17362,39 +17726,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 "Επεξεργασία χρήσης γης κοιμητηρίου"
 
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2894
 msgid "Retail"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2895
 msgid "Edit Retail Landuse"
 msgstr ""
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2900
 msgid "Commercial"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2901
 msgid "Edit Commercial Landuse"
 msgstr ""
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2906
 msgid "Industrial"
 msgstr "Βιομηχανική"
 
 #. item
-#: build/trans_presets.java:2906
+#: build/trans_presets.java:2907
 msgid "Edit Industrial Landuse"
 msgstr ""
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2912
 msgid "Railway land"
 msgstr ""
@@ -17402,15 +17766,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 ""
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:2919
 msgid "Military"
 msgstr "Στρατιωτικά"
 
 #. item
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2920
 msgid "Edit Military Landuse"
 msgstr ""
@@ -17418,55 +17782,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2925
+#: build/trans_presets.java:2926
 msgid "Construction area"
 msgstr "Εγοτάξιο"
 
 #. item
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2927
 msgid "Edit Construction Landuse"
 msgstr "Επεξεργασία εργοταξίου"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2932
 msgid "Brownfield"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:2933
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2937
+#: build/trans_presets.java:2938
 msgid "Greenfield"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:2939
 msgid "Edit Greenfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:2944
 msgid "Landfill"
 msgstr "ΧΥΤΑ"
 
 #. item
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:2945
 msgid "Edit Landfill Landuse"
 msgstr "Επεξεργασία Χρήσης γης ΧΥΤΑ"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2950
 msgid "Quarry"
 msgstr "Λατομείο"
 
 #. item
-#: build/trans_presets.java:2950
+#: build/trans_presets.java:2951
 msgid "Edit Quarry Landuse"
 msgstr "Επεξεργασία Λατομείου"
 
 #. group "Relations"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2960
 msgid "Multipolygon"
 msgstr ""
@@ -17476,5 +17840,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 ""
@@ -17483,10 +17847,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:2970
 msgid "outer segment"
 msgstr ""
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:2970
+#: build/trans_presets.java:2971
 msgid "inner segment"
 msgstr ""
@@ -17494,5 +17858,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:2974
 msgid "Turn restriction"
 msgstr "Περιορισμός στροφής"
@@ -17501,5 +17865,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 "Επεξεργασία περιορισμού στροφής"
@@ -17507,34 +17871,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 "Περιορισμός"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_left_turn"
 msgstr "όχι_αριστερή_στροφή"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_right_turn"
 msgstr "όχι_δεξιά_στροφή"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_straight_on"
 msgstr "όχι_ευθεία"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_u_turn"
 msgstr "όχι_αναστροφή"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "only_right_turn"
 msgstr "μόνο_δεξιά_στροφή"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "only_left_turn"
 msgstr "μόνο_αριστερή_στροφή"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "only_straight_on"
 msgstr "μόνο_ευθεία"
@@ -17543,15 +17907,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2983
+#: build/trans_presets.java:2984
 msgid "from way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2985
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2986
 msgid "to way"
 msgstr ""
@@ -17559,5 +17923,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:2988
+#: build/trans_presets.java:2989
 msgid "Route"
 msgstr "Διαδρομή"
@@ -17566,5 +17930,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 "Επεξεργασία Διαδρομής"
@@ -17572,5 +17936,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 "Τύπος Διαδρομής"
@@ -17642,5 +18006,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
@@ -17649,17 +18013,17 @@
 msgstr "ποδήλατο"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "bus"
 msgstr "λεωφορείο"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "road"
 msgstr "δρόμος"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "ski"
 msgstr "σκι"
@@ -17712,5 +18076,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
@@ -17719,13 +18083,13 @@
 msgstr ""
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "hiking"
 msgstr "πεζοπορία"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "tram"
 msgstr "τραμ"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "detour"
 msgstr "παράκαμψη"
@@ -17739,10 +18103,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 "υπόγειος"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:2997
 msgid "Symbol description"
 msgstr "Περιγραφή συμβόλου"
@@ -17750,26 +18114,26 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:2999
+#: build/trans_presets.java:3000
 msgid "Network"
 msgstr "Δίκτυο"
 
 #. item "Relations/Route" combo "State"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "proposed"
 msgstr "προτεινόμενο"
 
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "alternate"
 msgstr "εναλλακτικό"
 
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "temporary"
 msgstr "προσωρινό"
 
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "connection"
 msgstr "σύνδεση"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3003
 msgid "Color (hex)"
 msgstr "Χρώμα (δεκαεξαδικό)"
@@ -17778,30 +18142,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:3006
 msgid "route segment"
 msgstr "τμήμα διαδρομής"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3007
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3008
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3009
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3010
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3011
 msgid "backward halt point"
 msgstr ""
@@ -21919,4 +22283,13 @@
 #~ msgstr "Αποστολή δεδομένων"
 
+#~ msgid "Email"
+#~ msgstr "Email"
+
+#~ msgid "Login name (email) to the OSM account."
+#~ msgstr "Όνομα χρήστη (email) για τον λογαριασμό OSM."
+
+#~ msgid "OSM username (email)"
+#~ msgstr "Όνομα χρήστη OSM (email)"
+
 #~ msgid "Unknown host"
 #~ msgstr "Άγνωστος υπολογιστής"
@@ -21924,4 +22297,11 @@
 #~ msgid "Add either site-josm.xml or Wiki Pages."
 #~ msgstr "Προσθέστε είτε το site-josm.xml ή τις Σελίδες Βίκι."
+
+#~ msgid ""
+#~ "Server returned internal error. Try a reduced area or retry after waiting "
+#~ "some time."
+#~ msgstr ""
+#~ "Ο διακομιστής επέστρεψε εσωτερικό σφάλμα. Δοκιμάστε μια μικρότερη περιοχή "
+#~ "ή ξαναδοκιμάστε αργότερα."
 
 #~ msgid "Commit comment"
@@ -21979,4 +22359,30 @@
 #~ "{0}"
 
+#~ msgid "Open the OpenStreetBugs window and activate the automatic download"
+#~ msgstr ""
+#~ "Άνοιγμα του παραθύρου OpenStreetBugs και ενεργοποίηση αυτόματης λήψης"
+
 #~ msgid "Delete and Download"
 #~ msgstr "Διαγραφή και Λήψη"
+
+#~ msgid ""
+#~ "This action will require {0} individual download requests. Do you wish to "
+#~ "continue?"
+#~ msgstr ""
+#~ "Αυτή η ενέργεια θα απαιτήσει {0} επιμέρους αιτήσης λήψης. Θέλετε να "
+#~ "συνεχίσετε;"
+
+#~ msgid "The following errors occured during mass download:"
+#~ msgstr "Τα παρακάτω σφάλματα συνέβησαν κατά την μαζική λήψη:"
+
+#~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">english</A>."
+#~ msgstr ""
+#~ "Η σελίδα βοήθειας λείπει. Δημιουργήστε την στα <A HREF=\"{0}\">αγγλικά</"
+#~ "A>."
+
+#~ msgid ""
+#~ "Helppage missing. Create it in <A HREF=\"{0}\">english</A> or <A HREF="
+#~ "\"{1}\">your language</A>."
+#~ msgstr ""
+#~ "Η σελίδα βοήθειας λείπει. Δημιουργήστε την στα <A HREF=\"{0}\">αγγλικά</"
+#~ "A> ή <A HREF=\"{1}\">στη γλώσσα σας</A>."
Index: applications/editors/josm/i18n/po/en_GB.po
===================================================================
--- applications/editors/josm/i18n/po/en_GB.po	(revision 16008)
+++ applications/editors/josm/i18n/po/en_GB.po	(revision 16009)
@@ -10,7 +10,7 @@
 "Project-Id-Version: JOSM\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-14 16:51+0200\n"
-"PO-Revision-Date: 2009-06-12 05:36+0000\n"
-"Last-Translator: nin2jardin <Unknown>\n"
+"POT-Creation-Date: 2009-06-19 21:52+0200\n"
+"PO-Revision-Date: 2009-06-19 19:26+0000\n"
+"Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: British English <en@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,5 +18,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-06-14 14:45+0000\n"
+"X-Launchpad-Export-Date: 2009-06-19 19:34+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -29,12 +29,12 @@
 #: ../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 "Help"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:261
-msgid "The projection could not be read from preferences. Using Mercartor"
-msgstr "The projection could not be read from preferences. Using Mercartor"
+msgid "The projection could not be read from preferences. Using Mercator"
+msgstr "The projection could not be read from preferences. Using Mercator"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:349
@@ -72,6 +72,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
@@ -88,8 +90,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
@@ -138,5 +140,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"
@@ -537,5 +539,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}"
@@ -607,6 +609,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:92
-msgid "Email"
-msgstr "E-Mail"
+msgid "E-Mail"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:96
@@ -644,12 +646,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
@@ -676,5 +680,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
@@ -707,5 +711,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:207
 #, java-format
-msgid "Helppage missing. Create it in <A HREF=\"{0}\">english</A>."
+msgid "Help page missing. Create it in <A HREF=\"{0}\">english</A>."
 msgstr "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
 
@@ -713,5 +717,5 @@
 #, 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 ""
@@ -1145,13 +1149,13 @@
 msgstr "Help: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:99
 msgid "Status Report"
 msgstr "Status Report"
 
-#: ../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 "Copy to clipboard and close"
 
-#: ../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
@@ -1350,16 +1354,14 @@
 msgstr "Unselect All (Escape)"
 
-#: ../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 "Update Data"
 
-#: ../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 "Updates the current data layer from the server (re-downloads data)"
 
-#: ../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?"
@@ -1367,88 +1369,263 @@
 "No data to update found. Have you already opened or downloaded a data layer?"
 
-#: ../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 ""
-"This action will require {0} individual download requests. Do you wish to "
-"continue?"
-
-#: ../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 ""
+"<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 assigned 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>"
+
+#: ../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 "Upload to OSM..."
 
-#: ../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 "Upload all changes to the OSM server."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:96
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:94
 msgid "Objects to add:"
 msgstr "Objects to add:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102
 msgid "Objects to modify:"
 msgstr "Objects to modify:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:110
 msgid "Objects to delete:"
 msgstr "Objects to delete:"
 
-#: ../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 "Provide a brief comment for the changes you are uploading:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:126
 msgid "Upload these changes?"
 msgstr "Upload these changes?"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:130
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
 msgid "Upload Changes"
 msgstr "Upload Changes"
 
-#: ../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 "Nothing to upload. Get some data first."
 
-#: ../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 "There are unresolved conflicts. You have to resolve these first."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:182
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:180
 msgid "No changes to upload."
 msgstr "No changes to upload."
 
-#: ../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 ""
@@ -1555,37 +1732,51 @@
 msgstr "Raw GPS data"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:44
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:46
 msgid "Downloading data"
 msgstr "Downloading data"
 
-#: ../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 "No data imported."
 
-#: ../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 "Data Layer {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 "OpenStreetMap data"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:37
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:45
 msgid "Data Layer"
 msgstr "Data Layer"
 
-#: ../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 "Download {0} of {1} ({2} left)"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:88
-msgid "The following errors occured during mass download:"
-msgstr "The following errors occurred during mass download:"
-
-#: ../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 "Errors during Download"
+
+#: ../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
@@ -1638,50 +1829,50 @@
 msgstr "Cannot add a node outside of the world."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:495
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:493
 msgid "Add node"
 msgstr "Add node"
 
-#: ../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 "Add node into way"
 
-#: ../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 "Connect existing way to node"
 
-#: ../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 "Add a new node to an existing way"
 
-#: ../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 "Add node into way and connect"
 
-#: ../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 "Create new node."
 
-#: ../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 "Select node under cursor."
 
-#: ../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."
 msgid_plural "Insert new node into {0} ways."
-msgstr[0] "Insert new node into {0} way."
+msgstr[0] "Insert new node into way."
 msgstr[1] "Insert new node into {0} ways."
 
-#: ../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 "Start new way from last node."
 
-#: ../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 "Continue way from last node."
 
-#: ../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 "Finish drawing."
@@ -1757,5 +1948,5 @@
 msgstr ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
-"Ctrl to rotate selected, or change selection"
+"Ctrl to rotate selected; or change selection"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48
@@ -2007,26 +2198,32 @@
 msgstr "Incorrect value of id operator: {0}. Number is expected."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:33
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:34
 msgid "Load Selection"
 msgstr "Load Selection"
 
-#: ../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 "Contact {0}..."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:45
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:46
 msgid "Downloading..."
 msgstr "Downloading..."
 
-#: ../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 "Could not read from URL: \"{0}\""
 
-#: ../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 "Parsing error in URL: \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:74
+msgid "Error while communicating with server."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67
@@ -2087,13 +2284,85 @@
 msgstr "Resolve {0} conflicts in {1} objects"
 
-#: ../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 "Resolve conflicts in coordinates in {0}"
+
+#. 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 "cannot resolve undecided conflict"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81
+#, java-format
+msgid "Delete {1} {0}"
+msgstr "Delete {1} {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97
+#, java-format
+msgid "Delete {0} {1}"
+msgstr "Delete {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153
+msgid "Conflicting relation"
+msgstr "Conflicting relation"
+
+#: ../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 ""
+"Selection \"{0}\" is used by relation \"{1}\" with role {2}.\n"
+"Delete from relation?"
+
+#: ../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 "Delete from relation"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
+#, java-format
+msgid ""
+"Selection \"{0}\" is used by relation \"{1}\".\n"
+"Delete from relation?"
+msgstr ""
+"Selection \"{0}\" is used by relation \"{1}\".\n"
+"Delete from relation?"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:366
+msgid "Split way segment"
+msgstr "Split way segment"
+
+#. 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 ""
+"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 "
+"be using them.<br>Do you really want to delete?"
+
+#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:53
+#, java-format
+msgid "Resolve conflicts in deleted state in {0}"
+msgstr "Resolve conflicts in deleted state in {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118
+msgid "Move"
+msgstr "Move"
+
 #: ../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"
@@ -2102,10 +2371,219 @@
 msgstr[1] "nodes"
 
-#: ../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 "RemoveRelationMember"
+
+#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
+msgid "Rotate"
+msgstr "Rotate"
+
+#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88
+msgid "Sequence"
+msgstr "Sequence"
+
+#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:72
+#, java-format
+msgid "Resolve {0} tag conflicts in {1} {2}"
+msgstr "Resolve {0} tag conflicts in {1} {2}"
+
+#: ../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 "Resolve version conflicts for {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52
+#, java-format
+msgid "Resolve conflicts in node list of of way {0}"
+msgstr "Resolve conflicts in node list of of way {0}"
+
+#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
+msgid "Apply?"
+msgstr "Apply?"
+
+#: ../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 ""
+"When reversing this way, the following changes to properties of the way and "
+"its nodes are suggested in order to maintain data consistency."
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28
+msgid "Relation"
+msgstr "Relation"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30
+msgid "Old role"
+msgstr "Old role"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:32
+msgid "New role"
+msgstr "New role"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
+msgid "Old key"
+msgstr "Old key"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
+msgid "Old value"
+msgstr "Old value"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
+msgid "New key"
+msgstr "New key"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
+msgid "New value"
+msgstr "New value"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:40
+msgid "Apply selected changes"
+msgstr "Apply selected changes"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41
+msgid "Don't apply changes"
+msgstr "Don't apply changes"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:83
+msgid "Please select which property changes you want to apply."
+msgstr "Please select which property changes you want to apply."
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:96
+msgid "Properties of "
+msgstr "Properties of "
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:120
+msgid "Roles in relations referring to"
+msgstr "Roles in relations referring to"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:136
+msgid "Automatic tag correction"
+msgstr "Automatic tag correction"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:314
+#, java-format
+msgid "Malformed config file at lines {0}"
+msgstr "Malformed config file at lines {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:324
+#, java-format
+msgid "Cannot open preferences directory: {0}"
+msgstr "Cannot open preferences directory: {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 "Preferences file had errors. Making backup of old one to {0}."
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:79
+#, java-format
+msgid "Preferences stored on {0}"
+msgstr "Preferences stored on {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:82
+#, java-format
+msgid "Could not upload preferences. Reason: {0}"
+msgstr "Could not upload preferences. Reason: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:93
+msgid "Could not load preferences from server."
+msgstr "Could not load preferences from server."
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:34
+msgid "different"
+msgstr "different"
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:262
+msgid "deleted"
+msgstr "deleted"
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
+msgid "true"
+msgstr "true"
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
+msgid "false"
+msgstr "false"
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20
+msgid "position"
+msgstr "position"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30
+msgid "Decimal Degrees"
+msgstr "Decimal Degrees"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
+msgid "Degrees Minutes Seconds"
+msgstr "Degrees Minutes Seconds"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+msgid "S"
+msgstr "S"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+msgid "N"
+msgstr "N"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+msgid "W"
+msgstr "W"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+msgid "E"
+msgstr "E"
+
+#: ../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 "incomplete"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
+#, java-format
+msgid "Error: {0}"
+msgstr "Error: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
+#, java-format
+msgid "Warning: {0}"
+msgstr "Warning: {0}"
+
+#: ../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"
@@ -2114,8 +2592,10 @@
 msgstr[1] "ways"
 
-#: ../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
@@ -2126,265 +2606,27 @@
 msgstr[1] "relations"
 
-#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:68
-#, java-format
-msgid "Resolve conflicts in coordinates in {0}"
-msgstr "Resolve conflicts in coordinates in {0}"
-
-#. 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 "cannot resolve undecided conflict"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81
-#, java-format
-msgid "Delete {1} {0}"
-msgstr "Delete {1} {0}"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97
-#, java-format
-msgid "Delete {0} {1}"
-msgstr "Delete {0} {1}"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153
-msgid "Conflicting relation"
-msgstr "Conflicting relation"
-
-#: ../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 ""
-"Selection \"{0}\" is used by relation \"{1}\" with role {2}.\n"
-"Delete from relation?"
-
-#: ../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 "Delete from relation"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
-#, java-format
-msgid ""
-"Selection \"{0}\" is used by relation \"{1}\".\n"
-"Delete from relation?"
-msgstr ""
-"Selection \"{0}\" is used by relation \"{1}\".\n"
-"Delete from relation?"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:366
-msgid "Split way segment"
-msgstr "Split way segment"
-
-#. 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 ""
-"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 "
-"be using them.<br>Do you really want to delete?"
-
-#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:53
-#, java-format
-msgid "Resolve conflicts in deleted state in {0}"
-msgstr "Resolve conflicts in deleted state in {0}"
-
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118
-msgid "Move"
-msgstr "Move"
-
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:52
-#, java-format
-msgid "Resolve conflicts in member list of of relation {0}"
-msgstr "Resolve conflicts in member list of relation {0}"
-
-#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66
-msgid "RemoveRelationMember"
-msgstr "RemoveRelationMember"
-
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
-msgid "Rotate"
-msgstr "Rotate"
-
-#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88
-msgid "Sequence"
-msgstr "Sequence"
-
-#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:84
-#, java-format
-msgid "Resolve {0} tag conflicts in {1} {2}"
-msgstr "Resolve {0} tag conflicts in {1} {2}"
-
-#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:57
-#, java-format
-msgid "Resolve version conflicts for {0} {1}"
-msgstr "Resolve version conflicts for {0} {1}"
-
-#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52
-#, java-format
-msgid "Resolve conflicts in node list of of way {0}"
-msgstr "Resolve conflicts in node list of of way {0}"
-
-#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
-msgid "Apply?"
-msgstr "Apply?"
-
-#: ../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 ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28
-msgid "Relation"
-msgstr "Relation"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30
-msgid "Old role"
-msgstr "Old role"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:32
-msgid "New role"
-msgstr "New role"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
-msgid "Old key"
-msgstr "Old key"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
-msgid "Old value"
-msgstr "Old value"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
-msgid "New key"
-msgstr "New key"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
-msgid "New value"
-msgstr "New value"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:40
-msgid "Apply selected changes"
-msgstr "Apply selected changes"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41
-msgid "Don't apply changes"
-msgstr "Don't apply changes"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:83
-msgid "Please select which property changes you want to apply."
-msgstr "Please select which property changes you want to apply."
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:96
-msgid "Properties of "
-msgstr "Properties of "
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:120
-msgid "Roles in relations referring to"
-msgstr "Roles in relations referring to"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:136
-msgid "Automatic tag correction"
-msgstr "Automatic tag correction"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:314
-#, java-format
-msgid "Malformed config file at lines {0}"
-msgstr "Malformed config file at lines {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:324
-#, java-format
-msgid "Cannot open preferences directory: {0}"
-msgstr "Cannot open preferences directory: {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 "Preferences file had errors. Making backup of old one to {0}."
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:79
-#, java-format
-msgid "Preferences stored on {0}"
-msgstr "Preferences stored on {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:82
-#, java-format
-msgid "Could not upload preferences. Reason: {0}"
-msgstr "Could not upload preferences. Reason: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:93
-msgid "Could not load preferences from server."
-msgstr "Could not load preferences from server."
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:34
-msgid "different"
-msgstr "different"
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:262
-msgid "deleted"
-msgstr "deleted"
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
-msgid "true"
-msgstr "true"
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
-msgid "false"
-msgstr "false"
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20
-msgid "position"
-msgstr "position"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30
-msgid "Decimal Degrees"
-msgstr "Decimal Degrees"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
-msgid "Degrees Minutes Seconds"
-msgstr "Degrees Minutes Seconds"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
-msgid "S"
-msgstr "S"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
-msgid "N"
-msgstr "N"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
-msgid "W"
-msgstr "W"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
-msgid "E"
-msgstr "E"
-
-#: ../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 "incomplete"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
-#, java-format
-msgid "Error: {0}"
-msgstr "Error: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
-#, java-format
-msgid "Warning: {0}"
-msgstr "Warning: {0}"
-
-#: ../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"
@@ -2398,5 +2640,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:122
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "railway"
 msgstr "railway"
@@ -2418,4 +2660,62 @@
 msgstr[1] "{0} nodes"
 
+#: ../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."
@@ -2563,5 +2863,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 "background"
@@ -2598,5 +2898,4 @@
 "and start a new layer on the new zone."
 msgstr ""
-"Copy text   \t\n"
 "IMPORTANT : data positioned far away from\n"
 "the current Lambert zone limits.\n"
@@ -2651,8 +2950,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
@@ -2664,7 +2963,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
@@ -2771,10 +3070,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 "Username"
 
 #: ../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 "Password"
@@ -2870,22 +3169,22 @@
 msgstr "Preference setting {0} has been removed since it is no longer used."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:146
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148
 msgid "File"
 msgstr "File"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150
 msgid "View"
 msgstr "View"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:149
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151
 msgid "Tools"
 msgstr "Tools"
 
-#: ../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 "Presets"
 
-#: ../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
@@ -2898,21 +3197,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 "Wireframe View"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:218
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221
 msgid "Toggle Wireframe view"
 msgstr "Toggle Wireframe view"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:244
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:247
 msgid "Full Screen"
 msgstr "Full Screen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:246
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:249
 msgid "Toggle Full Screen view"
 msgstr "Toggle Full Screen view"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:286
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:289
 msgid "Audio"
 msgstr "Audio"
@@ -2984,6 +3283,6 @@
 msgstr "(no object)"
 
-#: ../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 "layer not in list."
@@ -2993,9 +3292,9 @@
 msgstr "Contacting the OSM server..."
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:104
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:105
 msgid "Error while parsing"
 msgstr "Error while parsing"
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:107
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:108
 msgid "File not found"
 msgstr "File not found"
@@ -3068,5 +3367,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 "Members"
@@ -3276,5 +3575,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
@@ -3318,5 +3617,6 @@
 "html>"
 msgstr ""
-"html>Click <strong>{0}</strong> to finish merging my and their entries</html>"
+"<html>Click <strong>{0}</strong> to finish merging my and their entries</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:812
@@ -3358,5 +3658,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 "parameter '{0}' must not be null"
@@ -3397,8 +3697,6 @@
 msgid ""
 "Properties in the merged element. They will replace properties in my "
-"elements when  merge decisions are applied."
-msgstr ""
-"Properties in the merged element. They will replace properties in my "
 "elements when merge decisions are applied."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88
@@ -3451,5 +3749,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 "Role"
@@ -3553,5 +3851,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
@@ -3867,5 +4165,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 "Relations"
@@ -3971,66 +4269,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 "Apply Changes"
 
-#: ../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 "Basic"
 
-#: ../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 "Occupied By"
 
-#: ../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 "linked"
 
-#: ../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 "Tags (empty value deletes tag)"
 
-#: ../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 "Move Up"
 
-#: ../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 "Move the currently selected members up"
 
-#: ../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 "Add Selected"
 
-#: ../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 "Add all currently selected objects as members"
 
-#: ../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 "Remove Selected"
 
-#: ../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 "Remove all currently selected objects from relation"
 
-#: ../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 "Move Down"
 
-#: ../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 "Move the currently selected members down"
 
-#: ../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 "Remove the member in the current table row from this relation"
 
-#: ../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 "Download Members"
 
-#: ../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 "Download all incomplete ways and nodes in relation"
@@ -4075,5 +4373,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
@@ -4094,9 +4392,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 "yes"
 
-#: ../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
@@ -4118,31 +4416,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 "no"
 
-#: ../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 "Members: {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 "Relation Editor: {0}"
 
-#: ../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 "There were conflicts during import."
 
-#: ../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 "Error parsing server response."
 
-#: ../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 "Cannot connect to server."
+
+#: ../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
@@ -4208,17 +4509,17 @@
 msgstr "Data Sources and Types"
 
-#: ../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 "Download as new layer"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:174
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:173
 msgid "Download Area"
 msgstr "Download Area"
 
-#: ../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 "Download area too large, will probably be rejected by server"
 
-#: ../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 "Download area ok, size probably acceptable to server"
@@ -4246,5 +4547,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 "Places"
@@ -4291,21 +4592,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 "type"
@@ -4345,14 +4646,4 @@
 msgid "Tile Numbers"
 msgstr "Tile Numbers"
-
-#: ../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 "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
-
-#. 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 "Map"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:98
@@ -4431,5 +4722,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)"
@@ -4545,14 +4836,14 @@
 msgstr "Wave Audio files (*.wav)"
 
-#: ../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 "Audio markers from {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244
 msgid "Import images"
 msgstr "Import images"
 
-#: ../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, "
@@ -4561,5 +4852,5 @@
 msgstr[1] "{0} tracks, "
 
-#: ../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, "
@@ -4568,5 +4859,5 @@
 msgstr[1] "{0} routes, "
 
-#: ../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"
@@ -4575,28 +4866,28 @@
 msgstr[1] "{0} waypoints"
 
-#: ../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 "Name: {0}"
 
-#: ../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 "Description: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347
 msgid "Timespan: "
 msgstr "Timespan: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354
 msgid "Length: "
 msgstr "Length: "
 
-#: ../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 "Convert to data layer"
 
-#: ../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 ""
@@ -4607,11 +4898,11 @@
 "<br>If you want to upload traces, look here:"
 
-#: ../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
@@ -4621,29 +4912,29 @@
 msgstr "Converted from: {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 "Download from OSM along this track"
 
-#: ../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 "Download everything within:"
 
-#: ../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 "{0} metres"
 
-#: ../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 "Maximum area per request:"
 
-#: ../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 "{0} sq km"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:822
 #, java-format
 msgid ""
@@ -4654,9 +4945,9 @@
 "wish<br>to continue?</html>"
 
-#: ../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 "No GPX track available in layer to associate audio with."
 
-#: ../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 "
@@ -4666,5 +4957,5 @@
 "the end were omitted or moved to the start."
 
-#: ../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 "
@@ -4674,33 +4965,42 @@
 "time were omitted."
 
-#: ../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 "outside downloaded area"
 
-#: ../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 "version {0}"
 
-#: ../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 "{0} consists of:"
 
-#: ../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} deleted.)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:371
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:396
 msgid "unset"
 msgstr "unset"
 
-#: ../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 "API version: {0}"
 
-#: ../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"
@@ -4708,21 +5008,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"
@@ -4871,5 +5171,5 @@
 msgstr "Default value currently unknown (setting has not been used yet)."
 
-#: ../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
@@ -4878,5 +5178,5 @@
 msgstr "Please select the row to edit."
 
-#: ../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
@@ -4884,5 +5184,5 @@
 msgstr "New value for {0}"
 
-#: ../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
@@ -4892,5 +5192,5 @@
 msgstr "Please select the row to delete."
 
-#: ../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 "Enter a new key/value pair"
@@ -5781,106 +6081,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 "Name"
@@ -6357,6 +6657,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:36
-msgid "Login name (email) to the OSM account."
-msgstr "Login name (e-mail) to the OSM account."
+msgid "Login name (e-mail) to the OSM account."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
@@ -6371,6 +6671,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
-msgid "OSM username (email)"
-msgstr "OSM username (e-mail)"
+msgid "OSM username (e-mail)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
@@ -6381,10 +6681,7 @@
 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 "
-"URL.<br><b>Do not use a valuable Password.</b></html>"
-msgstr ""
-"<html>WARNING: The password is stored in plain text in the preferences file."
 "<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 ""
 
 #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on
@@ -6703,6 +7000,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 "Contacting OSM Server..."
@@ -6713,7 +7011,7 @@
 msgstr "Downloading points {0} to {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 "Downloading OSM data..."
@@ -6778,15 +7076,14 @@
 msgstr "NMEA import faliure!"
 
-#: ../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 "This version of JOSM is incompatible with the configured server."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:207
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172
 #, java-format
 msgid ""
@@ -6797,31 +7094,37 @@
 "{0} to {1}."
 
-#: ../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 "Communications with {0} established using protocol version {1}"
 
-#: ../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 "Cannot read numeric value from response"
-
-#: ../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 "Opening changeset..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:351
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298
 msgid "Closing changeset..."
 msgstr "Closing changeset..."
 
-#: ../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 "No changeset present for diff upload"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:376
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:321
 msgid "Preparing..."
 msgstr "Preparing..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:381
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:326
 msgid "Uploading..."
 msgstr "Uploading..."
@@ -6836,25 +7139,25 @@
 msgstr "Invalid bz2 file."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:80
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:73
 msgid "Incorrect password or username."
 msgstr "Incorrect password or username."
 
-#: ../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 "Warning: The password is transferred unencrypted."
 
-#: ../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 "Save user and password (unencrypted)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:89
 msgid "Enter Password"
 msgstr "Enter Password"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
 msgid "Login"
 msgstr "Login"
 
-#: ../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..."
@@ -6865,4 +7168,47 @@
 msgstr "OSM Server Files gzip compressed"
 
+#: ../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."
@@ -6956,9 +7302,23 @@
 msgstr "Ill-formed node id"
 
-#: ../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 "Contacting Server..."
 
-#: ../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."
@@ -6966,17 +7326,9 @@
 "Couldn't connect to the osm server. Please check your internet connection."
 
-#: ../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 returned internal error. Try a reduced area or retry after waiting "
-"some time."
-
-#: ../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 ""
 
@@ -6992,5 +7344,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 "Download Plugins"
@@ -7180,9 +7532,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 "Download missing plugins"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:128
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:119
 #, java-format
 msgid ""
@@ -7195,6 +7547,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
@@ -7217,35 +7569,35 @@
 msgstr "unknown"
 
-#: ../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}: Version {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 bundled with JOSM"
 
-#: ../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 "Error reading plugin information file: {0}"
 
-#: ../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 "This is after the end of the recording"
 
-#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:329
+#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:340
 msgid "Error playing sound"
 msgstr "Error playing sound"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
 msgid "Do nothing"
 msgstr "Do nothing"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
 msgid "Report Bug"
 msgstr "Report Bug"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:52
 msgid ""
 "An unexpected exception occurred.\n"
@@ -7259,18 +7611,18 @@
 "version of JOSM, please consider being kind and file a bug report."
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55
 msgid "Unexpected Exception"
 msgstr "Unexpected Exception"
 
-#: ../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 "Please report a ticket at {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 "Include your steps to get to the error (as detailed as possible)!"
 
-#: ../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 "
@@ -7280,9 +7632,9 @@
 "a bug."
 
-#: ../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 "Be sure to include the following information:"
 
-#: ../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 "(The text has already been copied to your clipboard.)"
@@ -7368,5 +7720,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 "Description"
@@ -7748,9 +8100,7 @@
 #: ../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 "
-"adjust the sliders to manually match the photos."
-msgstr ""
 "An error occurred while trying to match the photos to the GPX track. You can "
 "adjust the sliders to manually match the photos."
+msgstr ""
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:853
@@ -7782,5 +8132,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"
@@ -7803,5 +8152,5 @@
 msgstr "Lambert Zone 4 cache file (.4)"
 
-#: ../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
@@ -7896,6 +8245,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/"
@@ -7903,6 +8252,6 @@
 "by this plugin."
 msgstr ""
-"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/"
@@ -7981,6 +8330,6 @@
 msgstr "Add \"source=...\" to elements?"
 
-#: ../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
@@ -7988,11 +8337,11 @@
 msgstr "Downloading {0}"
 
-#: ../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 "Contacting WMS Server..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:157
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:158
 msgid "Create buildings"
 msgstr "Create buildings"
@@ -8011,13 +8360,13 @@
 msgstr "Please, enable auto-sourcing and check cadastre millesime."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:61
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:62
 msgid "Extract SVG ViewBox..."
 msgstr "Extract SVG ViewBox..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:65
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:66
 msgid "Extract best fitting boundary..."
 msgstr "Extract best fitting boundary..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:126
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:127
 msgid "Create boundary"
 msgstr "Create boundary"
@@ -8038,6 +8387,6 @@
 #: ../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"
-msgstr "Download Image from french Cadastre WMS"
+msgid "Download Image from French Cadastre WMS"
+msgstr "Download Image from French Cadastre WMS"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:23
@@ -8133,5 +8482,5 @@
 "Select one of them first, then retry"
 
-#: ../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
@@ -8139,59 +8488,28 @@
 msgstr "Blank Layer"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:176
 #, java-format
 msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr "WMS layer ({0}), {1} tile(s) loaded"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:183
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:178
 msgid "Is not vectorized."
 msgstr "Is not vectorised."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:179
 #, java-format
 msgid "Raster center: {0}"
 msgstr "Raster centre: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181
 msgid "Is vectorized."
 msgstr "Is vectorised."
 
-#: ../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 "Commune bbox: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:282
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
-msgid "Save WMS layer to file"
-msgstr "Save WMS layer to file"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:287
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:295
-msgid "Save WMS layer"
-msgstr "Save WMS layer"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:309
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
-msgid "Load WMS layer from file"
-msgstr "Load WMS layer from file"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:314
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:323
-msgid "Load WMS layer"
-msgstr "Load WMS layer"
-
-#: ../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 "Unsupported WMS file version; found {0}, expected {1}"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:325
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:335
-msgid "File Format Error"
-msgstr "File Format Error"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:481
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:401
 #, java-format
 msgid ""
@@ -8202,14 +8520,14 @@
 "Create a new one."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:482
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402
 msgid "Cache Format Error"
 msgstr "Cache Format Error"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:497
-#, java-format
-msgid "Lambert zone {0} in cache  incompatible with current Lambert zone {1}"
-msgstr "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
-
-#: ../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 "Cache Lambert Zone Error"
@@ -8307,11 +8625,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 "Import path from GPX layer"
 
 #: ../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 "Drop existing path"
@@ -8321,5 +8639,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 "No GPX data layer found."
@@ -8610,4 +8928,8 @@
 msgid "Lakewalker trace"
 msgstr "Lakewalker trace"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:10
+msgid "An unknown error has occurred"
+msgstr ""
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
@@ -8925,42 +9247,42 @@
 msgstr "LiveGPS"
 
-#: ../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 "Measured values"
 
-#: ../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 "Open the measurement window."
 
-#: ../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 "Reset"
 
-#: ../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 "Reset current measurement results and delete measurement path."
 
-#: ../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 "Path Length"
 
-#: ../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 "Selection Length"
 
-#: ../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 "Selection Area"
 
-#: ../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 "Angle"
 
-#: ../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 "Angle between two selected Nodes"
 
-#: ../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 "Layer to make measurements"
@@ -9019,6 +9341,6 @@
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
-msgid "Open the OpenStreetBugs window and activate the automatic download"
-msgstr "Opens the OpenStreetBugs window and activates the automatic download"
+msgid "Opens the OpenStreetBugs window and activates the automatic download"
+msgstr ""
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:123
@@ -9097,5 +9419,5 @@
 msgstr "Osmarender"
 
-#: ../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 "
@@ -9105,9 +9427,9 @@
 "the preferences."
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:123
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:127
 msgid "osmarender options"
 msgstr "osmarender options"
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:124
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:128
 msgid "Firefox executable"
 msgstr "Firefox executable"
@@ -9538,5 +9860,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 "Street name"
@@ -9629,6 +9951,6 @@
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:195
-msgid "No intersections found. Nothing was changed."
-msgstr "No intersection found. Nothing was changed."
+msgid "No intersection found. Nothing was changed."
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:217
@@ -10508,39 +10830,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 ""
-"You can add, edit and delete WMS entries in the WMSplugin Preference Tab - "
-"these will then show up in the WMS menu.\n"
-"\n"
-"You can also do this manually in the Advanced Preferences, using the "
-"following schema:\n"
-"wmsplugin.url.1.name=Landsat\n"
-"wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n"
-"wmsplugin.url.2.name=NPE Maps... etc\n"
-"\n"
-"Full WMS URL input format example (landsat)\n"
-"http://onearth.jpl.nasa.gov/wms.cgi?"
-"request=GetMap&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"
-"http://labs.metacarta.com/rectifier/wms.cgi?"
-"id=73&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&\n"
-"format=image/png"
-
-#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:54
+
+#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:53
 msgid "WMS Plugin Help"
 msgstr "WMS Plugin Help"
@@ -10599,5 +10900,5 @@
 msgstr "Adjust the position of the selected WMS layer"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113
 #, java-format
 msgid ""
@@ -10643,4 +10944,29 @@
 msgid "Alpha channel"
 msgstr "Alpha channel"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
+msgid "Save WMS layer to file"
+msgstr "Save WMS layer to file"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:295
+msgid "Save WMS layer"
+msgstr "Save WMS layer"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
+msgid "Load WMS layer from file"
+msgstr "Load WMS layer from file"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:323
+msgid "Load WMS layer"
+msgstr "Load WMS layer"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:334
+#, java-format
+msgid "Unsupported WMS file version; found {0}, expected {1}"
+msgstr "Unsupported WMS file version; found {0}, expected {1}"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:335
+msgid "File Format Error"
+msgstr "File Format Error"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:163
@@ -10735,4 +11061,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 "You must make your edits public to upload new data"
@@ -10749,6 +11080,6 @@
 #. Plugin cadastre-fr
 #: build/trans_plugins.java:5
-msgid "A special handler for the french land registry WMS server."
-msgstr "A special handler for the french land registry WMS server."
+msgid "A special handler for the French land registry WMS server."
+msgstr "A special handler for the French land registry WMS server."
 
 #. Plugin colorscheme
@@ -11067,5 +11398,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 "Reference"
@@ -11567,5 +11898,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 "Width (metres)"
@@ -12034,7 +12365,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 "Type"
@@ -12650,10 +12981,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 "Operator"
@@ -12865,7 +13196,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 "Elevation"
@@ -13797,5 +14128,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 "Fee"
@@ -13931,5 +14262,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 "Reference (track number)"
@@ -13937,5 +14268,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 "Area"
@@ -13987,11 +14318,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 "Shelter"
+
+#. item "Public Transport/Bus Stop" check "Shelter"
 #. </optional>
-#: build/trans_presets.java:1503
+#: build/trans_presets.java:1504
 msgid "Bus Platform"
 msgstr "Bus Platform"
 
 #. item
-#: build/trans_presets.java:1504
+#: build/trans_presets.java:1505
 msgid "Edit Bus Platform"
 msgstr "Edit Bus Platform"
@@ -13999,5 +14340,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1512
+#: build/trans_presets.java:1513
 msgid "Taxi"
 msgstr "Taxi"
@@ -14005,5 +14346,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 "Edit Taxi station"
@@ -14011,5 +14352,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1519
+#: build/trans_presets.java:1520
 msgid "Airport"
 msgstr "Airport"
@@ -14017,15 +14358,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 "Edit Airport"
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1526
+#: build/trans_presets.java:1527
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1527
+#: build/trans_presets.java:1528
 msgid "ICAO"
 msgstr "ICAO"
@@ -14034,5 +14375,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1532
+#: build/trans_presets.java:1533
 msgid "Accomodation"
 msgstr "Accomodation"
@@ -14044,5 +14385,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 "Hotel"
@@ -14051,15 +14392,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 "Edit Hotel"
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1539
+#: build/trans_presets.java:1540
 msgid "Stars"
 msgstr "Stars"
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1541
+#: build/trans_presets.java:1542
 msgid "Motel"
 msgstr "Motel"
@@ -14067,20 +14408,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 "Edit Motel"
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1547
+#: build/trans_presets.java:1548
 msgid "Guest House"
 msgstr "Guest House"
 
 #. item
-#: build/trans_presets.java:1548
+#: build/trans_presets.java:1549
 msgid "Edit Guest House"
 msgstr "Edit Guest House"
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1552
+#: build/trans_presets.java:1553
 msgid "Chalet"
 msgstr "Chalet"
@@ -14088,10 +14429,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 "Edit Chalet"
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1558
+#: build/trans_presets.java:1559
 msgid "Hostel"
 msgstr "Hostel"
@@ -14099,30 +14440,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 "Edit Hostel"
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1564
+#: build/trans_presets.java:1565
 msgid "Alpine Hut"
 msgstr "Alpine Hut"
 
 #. item
-#: build/trans_presets.java:1565
+#: build/trans_presets.java:1566
 msgid "Edit Alpine Hut"
 msgstr "Edit Alpine Hut"
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1570
+#: build/trans_presets.java:1571
 msgid "Caravan Site"
 msgstr "Caravan Site"
 
 #. item
-#: build/trans_presets.java:1571
+#: build/trans_presets.java:1572
 msgid "Edit Caravan Site"
 msgstr "Edit Caravan Site"
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1575
+#: build/trans_presets.java:1576
 msgid "Camping Site"
 msgstr "Camp Site"
@@ -14130,10 +14471,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 "Edit Camp Site"
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1582
+#: build/trans_presets.java:1583
 msgid "Food+Drinks"
 msgstr "Food+Drinks"
@@ -14144,5 +14485,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 "Restaurant"
@@ -14150,5 +14491,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 "Edit Restaurant"
@@ -14156,5 +14497,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 "Cuisine"
@@ -14162,61 +14503,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 "italian"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "chinese"
 msgstr "chinese"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "burger"
 msgstr "burger"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "greek"
 msgstr "greek"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "german"
 msgstr "german"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "indian"
 msgstr "indian"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "regional"
 msgstr "regional"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "turkish"
 msgstr "turkish"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "asian"
 msgstr "asian"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "thai"
 msgstr "thai"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "mexican"
 msgstr "mexican"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "japanese"
 msgstr "japanese"
 
-#: build/trans_presets.java:1590
+#: build/trans_presets.java:1591
 msgid "Fast Food"
 msgstr "Fast Food"
@@ -14224,9 +14565,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 "Edit Fast Food Restaurant"
 
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1598
 msgid "Cafe"
 msgstr "Cafe"
@@ -14234,10 +14575,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 "Edit Cafe"
 
 #. item "Food+Drinks/Cafe" text "Name"
-#: build/trans_presets.java:1603
+#: build/trans_presets.java:1604
 msgid "Pub"
 msgstr "Pub"
@@ -14245,20 +14586,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 "Edit Pub"
 
 #. item "Food+Drinks/Pub" text "Name"
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1610
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item
-#: build/trans_presets.java:1610
+#: build/trans_presets.java:1611
 msgid "Edit Biergarten"
 msgstr "Edit Biergarten"
 
 #. item "Food+Drinks/Biergarten" text "Name"
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1615
 msgid "Bar"
 msgstr "Bar"
@@ -14266,10 +14607,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 "Edit Bar"
 
 #. item "Food+Drinks/Bar" text "Name"
-#: build/trans_presets.java:1620
+#: build/trans_presets.java:1621
 msgid "Nightclub"
 msgstr "Nightclub"
@@ -14277,20 +14618,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 "Edit Nightclub"
 
 #. item "Food+Drinks/Nightclub" text "Name"
-#: build/trans_presets.java:1627
+#: build/trans_presets.java:1628
 msgid "Tourism"
 msgstr "Tourism"
 
 #. group "Tourism"
-#: build/trans_presets.java:1628
+#: build/trans_presets.java:1629
 msgid "Attraction"
 msgstr "Attraction"
 
 #. item
-#: build/trans_presets.java:1629
+#: build/trans_presets.java:1630
 msgid "Edit Attraction"
 msgstr "Edit Attraction"
@@ -14299,11 +14640,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 "Opening Hours"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1634
+#: build/trans_presets.java:1635
 msgid "Museum"
 msgstr "Museum"
@@ -14311,10 +14652,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 "Edit Museum"
 
 #. item "Tourism/Museum" text "Name"
-#: build/trans_presets.java:1640
+#: build/trans_presets.java:1641
 msgid "Zoo"
 msgstr "Zoo"
@@ -14323,10 +14664,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 "Edit Zoo"
 
 #. item "Tourism/Zoo" text "Name"
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1648
 msgid "Viewpoint"
 msgstr "Viewpoint"
@@ -14334,25 +14675,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 "Edit Viewpoint"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1652
+#: build/trans_presets.java:1653
 msgid "Look-Out Tower"
 msgstr "Look-Out Tower"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1654
+#: build/trans_presets.java:1655
 msgid "Theme Park"
 msgstr "Theme Park"
 
 #. item
-#: build/trans_presets.java:1655
+#: build/trans_presets.java:1656
 msgid "Edit Theme Park"
 msgstr "Edit Theme Park"
 
 #. item "Tourism/Theme Park" text "Name"
-#: build/trans_presets.java:1659
+#: build/trans_presets.java:1660
 msgid "Artwork"
 msgstr "Artwork"
@@ -14360,5 +14701,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 "Edit Artwork"
@@ -14366,5 +14707,5 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1667
 msgid "Information Office"
 msgstr "Information Office"
@@ -14372,83 +14713,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 "Edit Information Office"
 
+#. item "Tourism/Information Office" text "Opening Hours"
+#: build/trans_presets.java:1675
+msgid "Map"
+msgstr "Map"
+
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1679
 msgid "Map Type"
 msgstr "Map Type"
 
 #. item "Tourism/Map" combo "Map Type"
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1679
 msgid "map"
 msgstr "map"
 
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1679
 msgid "citymap"
 msgstr "citymap"
 
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1679
 msgid "hikingmap"
 msgstr "hikingmap"
 
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1679
 msgid "bicyclemap"
 msgstr "bicyclemap"
 
 #. 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 "Closer Description"
 
 #. item "Tourism/Map" text "Closer Description"
-#: build/trans_presets.java:1681
+#: build/trans_presets.java:1682
 msgid "Information Board"
 msgstr "Information Board"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1686
 msgid "Board Type"
 msgstr "Board Type"
 
 #. item "Tourism/Information Board" combo "Board Type"
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1686
 msgid "board"
 msgstr "board"
 
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1686
 msgid "history"
 msgstr "history"
 
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1686
 msgid "nature"
 msgstr "nature"
 
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1686
 msgid "wildlife"
 msgstr "wildlife"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1688
+#: build/trans_presets.java:1689
 msgid "Guidepost (Hiking)"
 msgstr "Guidepost (Hiking)"
 
 #. item "Tourism/Guidepost (Hiking)" text "Elevation"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1696
 msgid "Other Information Points"
 msgstr "Other Information Points"
 
-#. 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 "Shelter"
-
-#. item
-#: build/trans_presets.java:1703
+#. item
+#: build/trans_presets.java:1704
 msgid "Edit Shelter"
 msgstr "Edit Shelter"
@@ -14456,25 +14794,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 "Fireplace"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1709
 msgid "Picnic Site"
 msgstr "Picnic Site"
 
 #. item
-#: build/trans_presets.java:1709
+#: build/trans_presets.java:1710
 msgid "Edit Picnic Site"
 msgstr "Edit Picnic Site"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1716
 msgid "Historic Places"
 msgstr "Historic Places"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1716
+#: build/trans_presets.java:1717
 msgid "Castle"
 msgstr "Castle"
@@ -14483,20 +14821,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 "Edit Castle"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1724
 msgid "Ruins"
 msgstr "Ruins"
 
 #. item
-#: build/trans_presets.java:1724
+#: build/trans_presets.java:1725
 msgid "Edit Ruins"
 msgstr "Edit Ruins"
 
 #. item "Historic Places/Ruins" text "Name"
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1729
 msgid "Archaeological Site"
 msgstr "Archaeological Site"
@@ -14505,10 +14843,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 "Edit Archaeological Site"
 
 #. item "Historic Places/Archaeological Site" text "Name"
-#: build/trans_presets.java:1735
+#: build/trans_presets.java:1736
 msgid "Battlefield"
 msgstr "Battlefield"
@@ -14516,5 +14854,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 "Edit Battlefield"
@@ -14522,15 +14860,15 @@
 #. item "Historic Places/Battlefield" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1743
 msgid "Monument"
 msgstr "Monument"
 
 #. item
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1744
 msgid "Edit Monument"
 msgstr "Edit Monument"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1748
 msgid "Memorial"
 msgstr "Memorial"
@@ -14538,45 +14876,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 "Edit Memorial"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1753
+#: build/trans_presets.java:1754
 msgid "Wayside Cross"
 msgstr "Wayside Cross"
 
 #. item
-#: build/trans_presets.java:1754
+#: build/trans_presets.java:1755
 msgid "Edit Wayside Cross"
 msgstr "Edit Wayside Cross"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1758
+#: build/trans_presets.java:1759
 msgid "Wayside Shrine"
 msgstr "Wayside Shrine"
 
 #. item
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1760
 msgid "Edit Wayside Shrine"
 msgstr "Edit Wayside Shrine"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1765
 msgid "Leisure"
 msgstr "Leisure"
 
 #. group "Leisure"
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1766
 msgid "Water Park"
 msgstr "Water Park"
 
 #. item
-#: build/trans_presets.java:1766
+#: build/trans_presets.java:1767
 msgid "Edit Water Park"
 msgstr "Edit Water Park"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1770
+#: build/trans_presets.java:1771
 msgid "Playground"
 msgstr "Playground"
@@ -14584,15 +14922,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 "Edit Playground"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1776
+#: build/trans_presets.java:1777
 msgid "Fishing"
 msgstr "Fishing"
 
 #. item
-#: build/trans_presets.java:1777
+#: build/trans_presets.java:1778
 msgid "Edit Fishing"
 msgstr "Edit Fishing"
@@ -14600,15 +14938,15 @@
 #. item "Leisure/Fishing" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1783
+#: build/trans_presets.java:1784
 msgid "Sport Facilities"
 msgstr "Sport Facilities"
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1784
+#: build/trans_presets.java:1785
 msgid "Stadium"
 msgstr "Stadium"
 
 #. item
-#: build/trans_presets.java:1785
+#: build/trans_presets.java:1786
 msgid "Edit Stadium"
 msgstr "Edit Stadium"
@@ -14622,6 +14960,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 "select sport:"
@@ -14997,6 +15335,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
@@ -15029,227 +15367,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 "multi"
 
-#: 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 "archery"
 
-#: 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 "athletics"
 
-#: 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 "australian_football"
 
-#: 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 "baseball"
 
-#: 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 "basketball"
 
-#: 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 "boules"
 
-#: 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 "lawn bowls"
 
-#: 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 "canoeing"
 
-#: 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 "climbing"
 
-#: 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 "cricket"
 
-#: 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 "cricket nets"
 
-#: 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 "croquet"
 
-#: 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 "cycling"
 
-#: 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 "dog racing"
 
-#: 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 "equestrian"
 
-#: 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 "football"
 
-#: 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 "golf"
 
-#: 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 "gymnastics"
 
-#: 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 "hockey"
 
-#: 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 "horse_racing"
 
-#: 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 "motor"
 
-#: 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 "pelota"
 
-#: 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 "racquet"
 
-#: 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 "rugby"
 
-#: 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 "shooting"
 
-#: 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 "skateboard"
 
-#: 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 "skating"
 
-#: 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 "skiing"
 
-#: 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 "soccer"
 
-#: 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 "swimming"
 
-#: 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 "table_tennis"
 
-#: 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 "tennis"
 
-#: build/trans_presets.java:1793
+#: build/trans_presets.java:1794
 msgid "Sports Centre"
 msgstr "Sports Centre"
 
 #. item
-#: build/trans_presets.java:1794
+#: build/trans_presets.java:1795
 msgid "Edit Sports Centre"
 msgstr "Edit Sports Centre"
 
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1803
 msgid "Pitch"
 msgstr "Pitch"
 
 #. item
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1804
 msgid "Edit Pitch"
 msgstr "Edit Pitch"
 
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1812
 msgid "Racetrack"
 msgstr "Racetrack"
 
 #. item
-#: build/trans_presets.java:1812
+#: build/trans_presets.java:1813
 msgid "Edit Racetrack"
 msgstr "Edit Racetrack"
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1821
 msgid "Golf Course"
 msgstr "Golf Course"
 
 #. item
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1822
 msgid "Edit Golf Course"
 msgstr "Edit Golf Course"
 
 #. item "Sport Facilities/Golf Course" text "Name"
-#: build/trans_presets.java:1825
+#: build/trans_presets.java:1826
 msgid "Miniature Golf"
 msgstr "Miniature Golf"
 
 #. item
-#: build/trans_presets.java:1826
+#: build/trans_presets.java:1827
 msgid "Edit Miniature Golf"
 msgstr "Edit Miniature Golf"
 
 #. item "Sport Facilities/Miniature Golf" text "Name"
-#: build/trans_presets.java:1831
+#: build/trans_presets.java:1832
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1833
 msgid "Multi"
 msgstr "Multi"
 
 #. item
-#: build/trans_presets.java:1833
+#: build/trans_presets.java:1834
 msgid "Edit Multi"
 msgstr "Edit Multi"
@@ -15288,191 +15626,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 "pitch"
 
-#: 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 "sports_centre"
 
-#: 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 "stadium"
 
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1839
 msgid "10pin"
 msgstr "10pin"
 
 #. item
-#: build/trans_presets.java:1839
+#: build/trans_presets.java:1840
 msgid "Edit 10pin"
 msgstr "Edit 10pin"
 
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1845
 msgid "Athletics"
 msgstr "Athletics"
 
 #. item
-#: build/trans_presets.java:1845
+#: build/trans_presets.java:1846
 msgid "Edit Athletics"
 msgstr "Edit Athletics"
 
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1851
 msgid "Archery"
 msgstr "Archery"
 
 #. item
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:1852
 msgid "Edit Archery"
 msgstr "Edit Archery"
 
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:1857
 msgid "Climbing"
 msgstr "Climbing"
 
 #. item
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:1858
 msgid "Edit Climbing"
 msgstr "Edit Climbing"
 
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1863
 msgid "Canoeing"
 msgstr "Canoeing"
 
 #. item
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:1864
 msgid "Edit Canoeing"
 msgstr "Edit Canoeing"
 
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:1869
 msgid "Cycling"
 msgstr "Cycling"
 
 #. item
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1870
 msgid "Edit Cycling"
 msgstr "Edit Cycling"
 
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1875
 msgid "Dog Racing"
 msgstr "Dog Racing"
 
 #. item
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1876
 msgid "Edit Dog Racing"
 msgstr "Edit Dog Racing"
 
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1881
 msgid "Equestrian"
 msgstr "Equestrian"
 
 #. item
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:1882
 msgid "Edit Equestrian"
 msgstr "Edit Equestrian"
 
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1887
 msgid "Horse Racing"
 msgstr "Horse Racing"
 
 #. item
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1888
 msgid "Edit Horse Racing"
 msgstr "Edit Horse Racing"
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:1893
 msgid "Gymnastics"
 msgstr "Gymnastics"
 
 #. item
-#: build/trans_presets.java:1893
+#: build/trans_presets.java:1894
 msgid "Edit Gymnastics"
 msgstr "Edit Gymnastics"
 
-#: build/trans_presets.java:1898
+#: build/trans_presets.java:1899
 msgid "Motor Sports"
 msgstr "Motor Sports"
 
 #. item
-#: build/trans_presets.java:1899
+#: build/trans_presets.java:1900
 msgid "Edit Motor Sports"
 msgstr "Edit Motor Sports"
 
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:1905
 msgid "Skating"
 msgstr "Skating"
 
 #. item
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:1906
 msgid "Edit Skating"
 msgstr "Edit Skating"
 
-#: build/trans_presets.java:1910
+#: build/trans_presets.java:1911
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:1912
 msgid "Edit Skateboard"
 msgstr "Edit Skateboard"
 
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:1917
 msgid "Swimming"
 msgstr "Swimming"
 
 #. item
-#: build/trans_presets.java:1917
+#: build/trans_presets.java:1918
 msgid "Edit Swimming"
 msgstr "Edit Swimming"
 
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:1923
 msgid "Skiing"
 msgstr "Skiing"
@@ -15480,56 +15818,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 "Edit Skiing"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1928
 msgid "Piste type"
 msgstr "Piste type"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1928
 msgid "downhill"
 msgstr "downhill"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1928
 msgid "nordic"
 msgstr "nordic"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1928
 msgid "snow_park"
 msgstr "snow_park"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:1929
 msgid "Difficulty"
 msgstr "Difficulty"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:1929
 msgid "novice"
 msgstr "novice"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:1929
 msgid "easy"
 msgstr "easy"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:1929
 msgid "intermediate"
 msgstr "intermediate"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:1929
 msgid "advanced"
 msgstr "advanced"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:1929
 msgid "expert"
 msgstr "expert"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:1929
 msgid "freeride"
 msgstr "freeride"
 
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1932
 msgid "Shooting"
 msgstr "Shooting"
@@ -15537,178 +15875,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 "Edit Shooting"
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1940
 msgid "Sport (Ball)"
 msgstr "Sport (Ball)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1941
 msgid "Soccer"
 msgstr "Football"
 
 #. item
-#: build/trans_presets.java:1941
+#: build/trans_presets.java:1942
 msgid "Edit Soccer"
 msgstr "Edit Football"
 
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:1947
 msgid "Football"
 msgstr "American Football"
 
 #. item
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:1948
 msgid "Edit Football"
 msgstr "Edit American Football"
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1953
 msgid "Australian Football"
 msgstr "Australian Football"
 
 #. item
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:1954
 msgid "Edit Australian Football"
 msgstr "Edit Australian Football"
 
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:1959
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:1960
 msgid "Edit Baseball"
 msgstr "Edit Baseball"
 
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:1965
 msgid "Basketball"
 msgstr "Basketball"
 
 #. item
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:1966
 msgid "Edit Basketball"
 msgstr "Edit Basketball"
 
-#: 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 "Edit Golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1975
 msgid "golf_course"
 msgstr "golf_course"
 
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:1977
 msgid "Boule"
 msgstr "Boule"
 
 #. item
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:1978
 msgid "Edit Boule"
 msgstr "Edit Boule"
 
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:1983
 msgid "Bowls"
 msgstr "Bowls"
 
 #. item
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1984
 msgid "Edit Bowls"
 msgstr "Edit Bowls"
 
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:1989
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:1990
 msgid "Edit Cricket"
 msgstr "Edit Cricket"
 
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:1995
 msgid "Cricket Nets"
 msgstr "Cricket Nets"
 
 #. item
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:1996
 msgid "Edit Cricket Nets"
 msgstr "Edit Cricket Nets"
 
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:2001
 msgid "Croquet"
 msgstr "Croquet"
 
 #. item
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:2002
 msgid "Edit Croquet"
 msgstr "Edit Croquet"
 
-#: build/trans_presets.java:2006
+#: build/trans_presets.java:2007
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item
-#: build/trans_presets.java:2007
+#: build/trans_presets.java:2008
 msgid "Edit Hockey"
 msgstr "Edit Hockey"
 
-#: build/trans_presets.java:2012
+#: build/trans_presets.java:2013
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2014
 msgid "Edit Pelota"
 msgstr "Edit Pelota"
 
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2019
 msgid "Racquet"
 msgstr "Racquet"
 
 #. item
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2020
 msgid "Edit Racquet"
 msgstr "Edit Racquet"
 
-#: build/trans_presets.java:2024
+#: build/trans_presets.java:2025
 msgid "Rugby"
 msgstr "Rugby"
 
 #. item
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2026
 msgid "Edit Rugby"
 msgstr "Edit Rugby"
 
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:2031
 msgid "Table Tennis"
 msgstr "Table Tennis"
 
 #. item
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2032
 msgid "Edit Table Tennis"
 msgstr "Edit Table 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 "Edit Tennis"
 
 #. <separator/>
-#: build/trans_presets.java:2044
+#: build/trans_presets.java:2045
 msgid "Buildings"
 msgstr "Buildings"
 
 #. group "Buildings"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2046
 msgid "Building"
 msgstr "Building"
@@ -15716,5 +16054,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2049
 msgid "Public Building"
 msgstr "Public Building"
@@ -15722,10 +16060,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 "Edit Public Building"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2055
 msgid "Town hall"
 msgstr "Town hall"
@@ -15733,10 +16071,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 "Edit Town hall"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2061
 msgid "Embassy"
 msgstr "Embassy"
@@ -15744,10 +16082,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 "Edit Embassy"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2066
+#: build/trans_presets.java:2067
 msgid "Courthouse"
 msgstr "Courthouse"
@@ -15756,10 +16094,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 "Edit Courthouse"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2074
 msgid "Prison"
 msgstr "Prison"
@@ -15768,10 +16106,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 "Edit Prison"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2080
+#: build/trans_presets.java:2081
 msgid "Police"
 msgstr "Police"
@@ -15781,10 +16119,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 "Edit Police"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2089
 msgid "Fire Station"
 msgstr "Fire Station"
@@ -15793,10 +16131,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 "Edit Fire Station"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2096
 msgid "Post Office"
 msgstr "Post Office"
@@ -15804,5 +16142,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 "Edit Post Office"
@@ -15810,15 +16148,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2103
 msgid "Kindergarten"
 msgstr "Preschool"
 
 #. item
-#: build/trans_presets.java:2103
+#: build/trans_presets.java:2104
 msgid "Edit Kindergarten"
 msgstr "Edit Preschool"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2108
 msgid "School"
 msgstr "School"
@@ -15826,10 +16164,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 "Edit School"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2114
 msgid "University"
 msgstr "University"
@@ -15837,10 +16175,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 "Edit University"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2120
 msgid "College"
 msgstr "College"
@@ -15848,5 +16186,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 "Edit College"
@@ -15854,5 +16192,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2126
+#: build/trans_presets.java:2127
 msgid "Cinema"
 msgstr "Cinema"
@@ -15861,10 +16199,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 "Edit Cinema"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2133
+#: build/trans_presets.java:2134
 msgid "Library"
 msgstr "Library"
@@ -15873,10 +16211,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 "Edit Library"
 
 #. item "Buildings/Library" text "Name"
-#: build/trans_presets.java:2140
+#: build/trans_presets.java:2141
 msgid "Arts Centre"
 msgstr "Arts Centre"
@@ -15884,10 +16222,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 "Edit Arts Centre"
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2146
+#: build/trans_presets.java:2147
 msgid "Theatre"
 msgstr "Theatre"
@@ -15896,10 +16234,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 "Edit Theatre"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2154
 msgid "Place of Worship"
 msgstr "Place of Worship"
@@ -15909,5 +16247,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 "Edit Place of Worship"
@@ -15916,6 +16254,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 "Religion"
@@ -15924,66 +16262,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 "bahai"
 
-#: 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 "buddhist"
 
-#: 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 "christian"
 
-#: 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 "jain"
 
-#: 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 "jewish"
 
-#: 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 "muslim"
 
-#: 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 "unitarian"
 
-#: 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 "zoroastrian"
 
-#: 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 "Denomination"
@@ -15992,81 +16330,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 "anglican"
 
-#: 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 "catholic"
 
-#: 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 "evangelical"
 
-#: 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 "jehovahs_witness"
 
-#: 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 "lutheran"
 
-#: 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 "methodist"
 
-#: 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 "mormon"
 
-#: 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 "orthodox"
 
-#: 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 "pentecostal"
 
-#: 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 "presbyterian"
 
-#: 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 "protestant"
 
-#: 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 "quaker"
 
-#: 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 "shia"
 
-#: 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 "sunni"
 
 #. <separator/>
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2165
 msgid "Addresses"
 msgstr "Addresses"
@@ -16075,5 +16413,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 "Edit Address Information"
@@ -16081,5 +16419,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2169
+#: build/trans_presets.java:2170
 msgid "House number"
 msgstr "House number"
@@ -16087,20 +16425,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2172
 msgid "House name"
 msgstr "House name"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2174
 msgid "City name"
 msgstr "City name"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2174
+#: build/trans_presets.java:2175
 msgid "Post code"
 msgstr "Post code"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2176
 msgid "Country code"
 msgstr "Country code"
@@ -16108,5 +16446,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2179
 msgid "Address Interpolation"
 msgstr "Address Interpolation"
@@ -16115,5 +16453,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 "Edit Address Interpolation"
@@ -16121,71 +16459,71 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2184
 msgid "Numbering scheme"
 msgstr "Numbering scheme"
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2184
 msgid "odd"
 msgstr "odd"
 
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2184
 msgid "even"
 msgstr "even"
 
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2184
 msgid "all"
 msgstr "all"
 
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2184
 msgid "alphabetic"
 msgstr "alphabetic"
 
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2187
 msgid "Man Made"
 msgstr "Man Made"
 
 #. group "Man Made"
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2188
 msgid "Works"
 msgstr "Works"
 
 #. item
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2189
 msgid "Edit Works"
 msgstr "Edit Works"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2193
 msgid "Tower"
 msgstr "Tower"
 
 #. item
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2194
 msgid "Edit Tower"
 msgstr "Edit Tower"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2198
 msgid "Water Tower"
 msgstr "Water Tower"
 
 #. item
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2199
 msgid "Edit Water Tower"
 msgstr "Edit Water Tower"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2203
 msgid "Gasometer"
 msgstr "Gasometer"
 
 #. item
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2204
 msgid "Edit Gasometer"
 msgstr "Edit Gasometer"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2207
+#: build/trans_presets.java:2208
 msgid "Lighthouse"
 msgstr "Lighthouse"
@@ -16193,10 +16531,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 "Edit Lighthouse"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2214
 msgid "Windmill"
 msgstr "Windmill"
@@ -16204,10 +16542,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 "Edit Windmill"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2220
 msgid "Pipeline"
 msgstr "Pipeline"
@@ -16215,10 +16553,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 "Edit Pipeline"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2225
+#: build/trans_presets.java:2226
 msgid "Wastewater Plant"
 msgstr "Sewerage Plant"
@@ -16228,10 +16566,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 "Edit Sewerage Plant"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2233
+#: build/trans_presets.java:2234
 msgid "Crane"
 msgstr "Crane"
@@ -16239,10 +16577,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 "Edit Crane"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2239
+#: build/trans_presets.java:2240
 msgid "Beacon"
 msgstr "Beacon"
@@ -16250,10 +16588,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 "Edit Beacon"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2245
+#: build/trans_presets.java:2246
 msgid "Survey Point"
 msgstr "Survey Point"
@@ -16261,10 +16599,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 "Edit Survey Point"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2252
 msgid "Surveillance"
 msgstr "Surveillance"
@@ -16272,5 +16610,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 "Edit Surveillance Camera"
@@ -16278,5 +16616,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2258
+#: build/trans_presets.java:2259
 msgid "Power Generator"
 msgstr "Power Generator"
@@ -16286,39 +16624,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 "Edit Power Generator"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "wind"
 msgstr "wind"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "hydro"
 msgstr "hydro"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "fossil"
 msgstr "fossil"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "nuclear"
 msgstr "nuclear"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "coal"
 msgstr "coal"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "photovoltaic"
 msgstr "photovoltaic"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "gas"
 msgstr "gas"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2268
 msgid "Power Station"
 msgstr "Power Station"
@@ -16327,10 +16665,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 "Edit Power Station"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2274
+#: build/trans_presets.java:2275
 msgid "Power Sub Station"
 msgstr "Power Sub Station"
@@ -16339,5 +16677,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 "Edit Power Sub Station"
@@ -16345,10 +16683,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 "Line reference"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2282
+#: build/trans_presets.java:2283
 msgid "Power Tower"
 msgstr "Power Tower"
@@ -16359,5 +16697,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 "Edit Power Tower"
@@ -16365,5 +16703,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 "Power Line"
@@ -16372,25 +16710,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 "Edit Power Line"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2298
 msgid "Voltage"
 msgstr "Voltage"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2299
 msgid "Amount of Wires"
 msgstr "Amount of Wires"
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2301
+#: build/trans_presets.java:2302
 msgid "Amenities"
 msgstr "Amenities"
 
 #. group "Amenities"
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2303
 msgid "Toilets"
 msgstr "Toilets"
@@ -16398,20 +16736,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 "Reference number"
 
 #. 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 "Note"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2312
 msgid "Post Box"
 msgstr "Post Box"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2317
 msgid "Telephone"
 msgstr "Telephone"
@@ -16420,5 +16758,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 "Edit Telephone"
@@ -16426,5 +16764,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 "Coins"
@@ -16432,5 +16770,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 "Notes"
@@ -16438,5 +16776,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 "Electronic purses and Charge cards"
@@ -16444,5 +16782,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 "Debit cards"
@@ -16450,15 +16788,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 "Credit cards"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2328
 msgid "Telephone cards"
 msgstr "Telephone cards"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2330
 msgid "Recycling"
 msgstr "Recycling"
@@ -16467,5 +16805,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 "Edit Recycling station"
@@ -16473,35 +16811,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 "Batteries"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2336
 msgid "Cans"
 msgstr "Cans"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2337
 msgid "Clothes"
 msgstr "Clothes"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2338
 msgid "Glass"
 msgstr "Glass"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2339
 msgid "Paper"
 msgstr "Paper"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2340
 msgid "Scrap Metal"
 msgstr "Scrap Metal"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2342
 msgid "Bench"
 msgstr "Bench"
@@ -16510,20 +16848,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 "Hunting Stand"
 
 #. item
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2347
 msgid "Edit Hunting Stand"
 msgstr "Edit Hunting Stand"
 
 #. item "Amenities/Hunting Stand" check "Shelter"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2350
 msgid "Hide"
 msgstr "Hide"
 
 #. item "Amenities/Hunting Stand" check "Hide"
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2351
 msgid "Lock"
 msgstr "Lock"
@@ -16531,22 +16869,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 "Height"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2351
+#: build/trans_presets.java:2352
 msgid "low"
 msgstr "low"
 
-#: build/trans_presets.java:2351
+#: build/trans_presets.java:2352
 msgid "half"
 msgstr "half"
 
-#: build/trans_presets.java:2351
+#: build/trans_presets.java:2352
 msgid "full"
 msgstr "full"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2354
 msgid "Fountain"
 msgstr "Fountain"
@@ -16555,10 +16893,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 "Edit Fountain"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2361
 msgid "Drinking Water"
 msgstr "Drinking Water"
@@ -16567,10 +16905,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 "Edit Drinking Water"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2367
+#: build/trans_presets.java:2368
 msgid "Baby Hatch"
 msgstr "Baby Hatch"
@@ -16578,25 +16916,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 "Edit Baby Hatch"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2375
+#: build/trans_presets.java:2376
 msgid "Shops"
 msgstr "Shops"
 
 #. 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 "Edit Supermarket"
 
 #. item "Shops/Supermarket" text "Name"
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:2382
 msgid "Convenience Store"
 msgstr "Convenience Store"
@@ -16604,10 +16942,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 "Edit Convenience Store"
 
 #. item "Shops/Convenience Store" text "Name"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2388
 msgid "Kiosk"
 msgstr "Kiosk"
@@ -16615,10 +16953,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 "Edit Kiosk"
 
 #. item "Shops/Kiosk" text "Name"
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2394
 msgid "Vending machine"
 msgstr "Vending machine"
@@ -16626,5 +16964,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 "Edit Vending machine"
@@ -16632,88 +16970,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 "Vending products"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "public_transport_tickets"
 msgstr "public_transport_tickets"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "public_transport_plans"
 msgstr "public_transport_plans"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "parking_tickets"
 msgstr "parking_tickets"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "food"
 msgstr "food"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "drinks"
 msgstr "drinks"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "sweets"
 msgstr "sweets"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "cigarettes"
 msgstr "cigarettes"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "photos"
 msgstr "photos"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "animal_food"
 msgstr "animal_food"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "news_papers"
 msgstr "news_papers"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "toys"
 msgstr "toys"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "stamps"
 msgstr "stamps"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "SIM-cards"
 msgstr "SIM-cards"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "telephone_vouchers"
 msgstr "telephone_vouchers"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "vouchers"
 msgstr "vouchers"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "condoms"
 msgstr "condoms"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "tampons"
 msgstr "tampons"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "excrement_bags"
 msgstr "excrement_bags"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2407
 msgid "Account or loyalty cards"
 msgstr "Account or loyalty cards"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2408
+#: build/trans_presets.java:2409
 msgid "Butcher"
 msgstr "Butcher"
@@ -16721,10 +17059,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 "Edit Butcher"
 
 #. item "Shops/Butcher" text "Name"
-#: build/trans_presets.java:2414
+#: build/trans_presets.java:2415
 msgid "Baker"
 msgstr "Baker"
@@ -16732,10 +17070,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 "Edit Baker"
 
 #. item "Shops/Baker" text "Name"
-#: build/trans_presets.java:2420
+#: build/trans_presets.java:2421
 msgid "Florist"
 msgstr "Florist"
@@ -16743,20 +17081,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 "Edit Florist"
 
 #. item "Shops/Florist" text "Name"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2427
 msgid "Organic"
 msgstr "Organic"
 
 #. item
-#: build/trans_presets.java:2427
+#: build/trans_presets.java:2428
 msgid "Edit Organic Shop"
 msgstr "Edit Organic Shop"
 
 #. item "Shops/Organic" text "Name"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2432
 msgid "Alcohol"
 msgstr "Alcohol"
@@ -16764,60 +17102,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 "Edit Alcohol Shop"
 
 #. item "Shops/Alcohol" text "Name"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2438
 msgid "Beverages"
 msgstr "Beverages"
 
 #. item
-#: build/trans_presets.java:2438
+#: build/trans_presets.java:2439
 msgid "Edit Beverages Shop"
 msgstr "Edit Beverages Shop"
 
 #. item "Shops/Beverages" text "Name"
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:2443
 msgid "Computer"
 msgstr "Computer"
 
 #. item
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2444
 msgid "Edit Computer Shop"
 msgstr "Edit Computer Shop"
 
 #. item "Shops/Computer" text "Name"
-#: build/trans_presets.java:2447
+#: build/trans_presets.java:2448
 msgid "Electronics"
 msgstr "Electronics"
 
 #. item
-#: build/trans_presets.java:2448
+#: build/trans_presets.java:2449
 msgid "Edit Electronics Shop"
 msgstr "Edit Electronics Shop"
 
 #. item "Shops/Electronics" text "Name"
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2453
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2454
 msgid "Edit Hifi Shop"
 msgstr "Edit Hifi Shop"
 
 #. item "Shops/Hifi" text "Name"
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2458
 msgid "Furniture"
 msgstr "Furniture"
 
 #. item
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2459
 msgid "Edit Furniture Shop"
 msgstr "Edit Furniture Shop"
 
 #. item "Shops/Furniture" text "Name"
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2463
 msgid "Garden Centre"
 msgstr "Garden Centre"
@@ -16825,10 +17163,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 "Edit Garden Centre"
 
 #. item "Shops/Garden Centre" text "Name"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2469
 msgid "Hardware"
 msgstr "Hardware"
@@ -16836,10 +17174,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 "Edit Hardware Store"
 
 #. item "Shops/Hardware" text "Name"
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2475
 msgid "Do-it-yourself-store"
 msgstr "Do-it-yourself-store"
@@ -16847,60 +17185,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 "Edit Do-it-yourself-store"
 
 #. item "Shops/Do-it-yourself-store" text "Name"
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2481
 msgid "Stationery"
 msgstr "Stationery"
 
 #. item
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2482
 msgid "Edit Stationery Shop"
 msgstr "Edit Stationery Shop"
 
 #. item "Shops/Stationery" text "Name"
-#: build/trans_presets.java:2485
+#: build/trans_presets.java:2486
 msgid "Hairdresser"
 msgstr "Hairdresser"
 
 #. item
-#: build/trans_presets.java:2486
+#: build/trans_presets.java:2487
 msgid "Edit Hairdresser"
 msgstr "Edit Hairdresser"
 
 #. item "Shops/Hairdresser" text "Name"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2491
 msgid "Shoes"
 msgstr "Shoes"
 
 #. item
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2492
 msgid "Edit Shoe Shop"
 msgstr "Edit Shoe Shop"
 
 #. item "Shops/Shoes" text "Name"
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2496
 msgid "Toys"
 msgstr "Toys"
 
 #. item
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2497
 msgid "Edit Toy Shop"
 msgstr "Edit Toy Shop"
 
 #. 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 "Edit Video Shop"
 
 #. item "Shops/Video" text "Name"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2506
 msgid "Dry Cleaning"
 msgstr "Dry Cleaning"
@@ -16908,10 +17246,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 "Edit Dry Cleaning"
 
 #. item "Shops/Dry Cleaning" text "Name"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2512
 msgid "Laundry"
 msgstr "Laundry"
@@ -16919,10 +17257,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 "Edit Laundry"
 
 #. item "Shops/Laundry" text "Name"
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2518
 msgid "Outdoor"
 msgstr "Outdoor"
@@ -16930,35 +17268,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 "Edit Outdoor Shop"
 
 #. item "Shops/Outdoor" text "Name"
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2524
 msgid "Sports"
 msgstr "Sports"
 
 #. item
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2525
 msgid "Edit Sports Shop"
 msgstr "Edit Sports Shop"
 
 #. item "Shops/Sports" text "Name"
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2529
 msgid "Optician"
 msgstr "Optician"
 
 #. item
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2530
 msgid "Edit Optician"
 msgstr "Edit Optician"
 
 #. item "Shops/Optician" text "Name"
-#: build/trans_presets.java:2535
+#: build/trans_presets.java:2536
 msgid "Cash"
 msgstr "Cash"
 
 #. group "Cash"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2537
 msgid "Bank"
 msgstr "Bank"
@@ -16966,5 +17304,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 "Edit Bank"
@@ -16972,10 +17310,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 "Automated Teller Machine"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2544
 msgid "Money Exchange"
 msgstr "Money Exchange"
@@ -16983,5 +17321,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 "Edit Money Exchange"
@@ -16989,15 +17327,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 "Edit Automated Teller Machine"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2557
 msgid "Health"
 msgstr "Health"
 
 #. group "Health"
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2558
 msgid "Doctors"
 msgstr "Doctors"
@@ -17005,20 +17343,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 "Edit Doctors"
 
 #. item "Health/Doctors" text "Name"
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2564
 msgid "Dentist"
 msgstr "Dentist"
 
 #. item
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2565
 msgid "Edit Dentist"
 msgstr "Edit Dentist"
 
 #. item "Health/Dentist" text "Name"
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2569
 msgid "Pharmacy"
 msgstr "Pharmacy"
@@ -17026,5 +17364,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 "Edit Pharmacy"
@@ -17032,10 +17370,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 "Dispensing"
 
 #. item "Health/Pharmacy" text "Name"
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2576
 msgid "Hospital"
 msgstr "Hospital"
@@ -17043,10 +17381,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 "Edit Hospital"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2582
 msgid "Emergency Access Point"
 msgstr "Emergency Access Point"
@@ -17055,5 +17393,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 "Edit Emergency Access Point"
@@ -17062,20 +17400,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2588
 msgid "Point Number"
 msgstr "Point Number"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2589
 msgid "Point Name"
 msgstr "Point Name"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2591
 msgid "Phone Number"
 msgstr "Phone Number"
 
 #. 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 "(Use international code, like +12-345-67890)"
@@ -17083,5 +17421,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 "Veterinary"
@@ -17090,25 +17428,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 "Edit Veterinary"
 
 #. group "Places"
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2605
 msgid "Continent"
 msgstr "Continent"
 
 #. item
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2606
 msgid "Edit Continent"
 msgstr "Edit Continent"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2611
 msgid "Country"
 msgstr "Country"
 
 #. item
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2612
 msgid "Edit Country"
 msgstr "Edit Country"
@@ -17116,30 +17454,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 "State"
 
 #. item
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2618
 msgid "Edit State"
 msgstr "Edit State"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2622
+#: build/trans_presets.java:2623
 msgid "Region"
 msgstr "Region"
 
 #. item
-#: build/trans_presets.java:2623
+#: build/trans_presets.java:2624
 msgid "Edit Region"
 msgstr "Edit Region"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2628
+#: build/trans_presets.java:2629
 msgid "County"
 msgstr "County"
 
 #. item
-#: build/trans_presets.java:2629
+#: build/trans_presets.java:2630
 msgid "Edit County"
 msgstr "Edit County"
@@ -17147,15 +17485,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2635
+#: build/trans_presets.java:2636
 msgid "City"
 msgstr "City"
 
 #. item
-#: build/trans_presets.java:2636
+#: build/trans_presets.java:2637
 msgid "Edit City"
 msgstr "Edit City"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2641
+#: build/trans_presets.java:2642
 msgid "Town"
 msgstr "Town"
@@ -17163,10 +17501,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 "Edit Town"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2649
 msgid "Suburb"
 msgstr "Suburb"
@@ -17174,25 +17512,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 "Edit Suburb"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2656
 msgid "Village"
 msgstr "Village"
 
 #. item
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2657
 msgid "Edit Village"
 msgstr "Edit Village"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2662
 msgid "Hamlet"
 msgstr "Hamlet"
 
 #. item
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2663
 msgid "Edit Hamlet"
 msgstr "Edit Hamlet"
@@ -17200,5 +17538,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2669
 msgid "Locality"
 msgstr "Locality"
@@ -17206,10 +17544,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 "Edit Locality"
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2676
 msgid "Island"
 msgstr "Island"
@@ -17217,5 +17555,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 "Edit Island"
@@ -17223,5 +17561,5 @@
 #. item "Places/Island" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2683
+#: build/trans_presets.java:2684
 msgid "Cave Entrance"
 msgstr "Cave Entrance"
@@ -17229,10 +17567,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 "Edit Cave Entrance"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2690
 msgid "Peak"
 msgstr "Peak"
@@ -17240,10 +17578,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 "Edit Peak"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2697
 msgid "Glacier"
 msgstr "Glacier"
@@ -17251,10 +17589,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 "Edit Glacier"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2703
+#: build/trans_presets.java:2704
 msgid "Volcano"
 msgstr "Volcano"
@@ -17262,70 +17600,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 "Edit Volcano"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2711
+#: build/trans_presets.java:2712
 msgid "Boundaries"
 msgstr "Boundaries"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2713
 msgid "National"
 msgstr "National"
 
 #. item
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2714
 msgid "Edit National Boundary"
 msgstr "Edit National Boundary"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2718
+#: build/trans_presets.java:2719
 msgid "Administrative"
 msgstr "Administrative"
 
 #. item
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2720
 msgid "Edit Administrative Boundary"
 msgstr "Edit Administrative Boundary"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2724
+#: build/trans_presets.java:2725
 msgid "Civil"
 msgstr "Civil"
 
 #. item
-#: build/trans_presets.java:2725
+#: build/trans_presets.java:2726
 msgid "Edit Civil Boundary"
 msgstr "Edit Civil Boundary"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2730
+#: build/trans_presets.java:2731
 msgid "Political"
 msgstr "Political"
 
 #. item
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:2732
 msgid "Edit Political Boundary"
 msgstr "Edit Political Boundary"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2736
+#: build/trans_presets.java:2737
 msgid "National park"
 msgstr "National park"
 
 #. item
-#: build/trans_presets.java:2737
+#: build/trans_presets.java:2738
 msgid "Edit National Park Boundary"
 msgstr "Edit National Park Boundary"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2744
 msgid "Land use"
 msgstr "Land use"
 
 #. group "Land use"
-#: build/trans_presets.java:2744
+#: build/trans_presets.java:2745
 msgid "Tree"
 msgstr "Tree"
@@ -17334,15 +17672,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 "Edit Tree"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2753
 msgid "Botanical Name"
 msgstr "Botanical Name"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2755
 msgid "Wood"
 msgstr "Wood"
@@ -17351,5 +17689,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 "Edit Wood"
@@ -17357,17 +17695,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 "coniferous"
 
-#: build/trans_presets.java:2760 build/trans_presets.java:2769
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
 msgid "deciduous"
 msgstr "deciduous"
 
-#: build/trans_presets.java:2760 build/trans_presets.java:2769
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
 msgid "mixed"
 msgstr "mixed"
 
-#: build/trans_presets.java:2762
+#: build/trans_presets.java:2763
 msgid "Forest"
 msgstr "Forest"
@@ -17376,14 +17714,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 "Edit Forest Landuse"
 
-#: build/trans_presets.java:2771
+#: build/trans_presets.java:2772
 msgid "Nature Reserve"
 msgstr "Nature Reserve"
 
 #. item
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2773
 msgid "Edit Nature Reserve"
 msgstr "Edit Nature Reserve"
@@ -17391,25 +17729,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2777
+#: build/trans_presets.java:2778
 msgid "Scree"
 msgstr "Scree"
 
 #. item
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:2779
 msgid "Edit Scree"
 msgstr "Edit Scree"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2783
 msgid "Scrub"
 msgstr "Scrub"
 
 #. item
-#: build/trans_presets.java:2783
+#: build/trans_presets.java:2784
 msgid "Edit Scrub"
 msgstr "Edit Scrub"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2788
 msgid "Fell"
 msgstr "Fell"
@@ -17417,10 +17755,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 "Edit Fell"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2794
 msgid "Heath"
 msgstr "Heath"
@@ -17428,5 +17766,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 "Edit Heath"
@@ -17434,5 +17772,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2801
 msgid "Farmyard"
 msgstr "Farmyard"
@@ -17441,45 +17779,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 "Edit Farmyard Landuse"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2808
+#: build/trans_presets.java:2809
 msgid "Farmland"
 msgstr "Farmland"
 
 #. item
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2810
 msgid "Edit Farmland Landuse"
 msgstr "Edit Farmland Landuse"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2814
+#: build/trans_presets.java:2815
 msgid "Meadow"
 msgstr "Meadow"
 
 #. item
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2816
 msgid "Edit Meadow Landuse"
 msgstr "Edit Meadow Landuse"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2820
+#: build/trans_presets.java:2821
 msgid "Vineyard"
 msgstr "Vineyard"
 
 #. item
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2822
 msgid "Edit Vineyard Landuse"
 msgstr "Edit Vineyard Landuse"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2826
+#: build/trans_presets.java:2827
 msgid "Allotments"
 msgstr "Allotments"
 
 #. item
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:2828
 msgid "Edit Allotments Landuse"
 msgstr "Edit Allotments Landuse"
@@ -17487,25 +17825,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2833
+#: build/trans_presets.java:2834
 msgid "Garden"
 msgstr "Garden"
 
 #. item
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2835
 msgid "Edit Garden"
 msgstr "Edit Garden"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2838
+#: build/trans_presets.java:2839
 msgid "Grass"
 msgstr "Grass"
 
 #. item
-#: build/trans_presets.java:2839
+#: build/trans_presets.java:2840
 msgid "Edit Grass Landuse"
 msgstr "Edit Grass Landuse"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2845
 msgid "Village Green"
 msgstr "Village Green"
@@ -17513,10 +17851,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 "Edit Village Green Landuse"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:2852
 msgid "Common"
 msgstr "Common"
@@ -17524,20 +17862,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 "Edit Common"
 
 #. 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 "Edit Park"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2863
 msgid "Recreation Ground"
 msgstr "Recreation Ground"
@@ -17545,5 +17883,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 "Edit Recreation Ground Landuse"
@@ -17551,15 +17889,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2871
 msgid "Residential area"
 msgstr "Residential area"
 
 #. item
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2872
 msgid "Edit Residential Landuse"
 msgstr "Edit Residential Landuse"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2877
 msgid "Graveyard"
 msgstr "Graveyard"
@@ -17567,9 +17905,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 "Edit Graveyard"
 
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:2885
 msgid "Cemetery"
 msgstr "Cemetery"
@@ -17577,39 +17915,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 "Edit Cemetery Landuse"
 
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2894
 msgid "Retail"
 msgstr "Retail"
 
 #. item
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2895
 msgid "Edit Retail Landuse"
 msgstr "Edit Retail Landuse"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2900
 msgid "Commercial"
 msgstr "Commercial"
 
 #. item
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2901
 msgid "Edit Commercial Landuse"
 msgstr "Edit Commercial Landuse"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2906
 msgid "Industrial"
 msgstr "Industrial"
 
 #. item
-#: build/trans_presets.java:2906
+#: build/trans_presets.java:2907
 msgid "Edit Industrial Landuse"
 msgstr "Edit Industrial Landuse"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2912
 msgid "Railway land"
 msgstr "Railway land"
@@ -17617,15 +17955,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 "Edit Railway Landuse"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:2919
 msgid "Military"
 msgstr "Military"
 
 #. item
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2920
 msgid "Edit Military Landuse"
 msgstr "Edit Military Landuse"
@@ -17633,55 +17971,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2925
+#: build/trans_presets.java:2926
 msgid "Construction area"
 msgstr "Construction area"
 
 #. item
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2927
 msgid "Edit Construction Landuse"
 msgstr "Edit Construction Landuse"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2932
 msgid "Brownfield"
 msgstr "Brownfield"
 
 #. item
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:2933
 msgid "Edit Brownfield Landuse"
 msgstr "Edit Brownfield Landuse"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2937
+#: build/trans_presets.java:2938
 msgid "Greenfield"
 msgstr "Greenfield"
 
 #. item
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:2939
 msgid "Edit Greenfield Landuse"
 msgstr "Edit Greenfield Landuse"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:2944
 msgid "Landfill"
 msgstr "Landfill"
 
 #. item
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:2945
 msgid "Edit Landfill Landuse"
 msgstr "Edit Landfill Landuse"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2950
 msgid "Quarry"
 msgstr "Quarry"
 
 #. item
-#: build/trans_presets.java:2950
+#: build/trans_presets.java:2951
 msgid "Edit Quarry Landuse"
 msgstr "Edit Quarry Landuse"
 
 #. group "Relations"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2960
 msgid "Multipolygon"
 msgstr "Multipolygon"
@@ -17691,5 +18029,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 "Edit Multipolygon"
@@ -17698,10 +18036,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:2970
 msgid "outer segment"
 msgstr "outer segment"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:2970
+#: build/trans_presets.java:2971
 msgid "inner segment"
 msgstr "inner segment"
@@ -17709,5 +18047,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:2974
 msgid "Turn restriction"
 msgstr "Turn restriction"
@@ -17716,5 +18054,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 "Edit Turn Restriction"
@@ -17722,34 +18060,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 "Restriction"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_left_turn"
 msgstr "no left turn"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_right_turn"
 msgstr "no right turn"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_straight_on"
 msgstr "no straight on"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_u_turn"
 msgstr "no U turn"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "only_right_turn"
 msgstr "only turn right"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "only_left_turn"
 msgstr "only turn left"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "only_straight_on"
 msgstr "only straight on"
@@ -17758,15 +18096,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2983
+#: build/trans_presets.java:2984
 msgid "from way"
 msgstr "from way"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2985
 msgid "via node or way"
 msgstr "via node or way"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2986
 msgid "to way"
 msgstr "to way"
@@ -17774,5 +18112,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:2988
+#: build/trans_presets.java:2989
 msgid "Route"
 msgstr "Route"
@@ -17781,5 +18119,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 "Edit Route"
@@ -17787,5 +18125,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 "Route type"
@@ -17857,5 +18195,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
@@ -17864,17 +18202,17 @@
 msgstr "bicycle"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "bus"
 msgstr "bus"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "road"
 msgstr "road"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "ferry"
 msgstr "ferry"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "ski"
 msgstr "ski"
@@ -17927,5 +18265,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
@@ -17934,13 +18272,13 @@
 msgstr "foot"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "hiking"
 msgstr "hiking"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "tram"
 msgstr "tram"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "detour"
 msgstr "detour"
@@ -17954,10 +18292,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 "subway"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:2997
 msgid "Symbol description"
 msgstr "Symbol description"
@@ -17965,26 +18303,26 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:2999
+#: build/trans_presets.java:3000
 msgid "Network"
 msgstr "Network"
 
 #. item "Relations/Route" combo "State"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "proposed"
 msgstr "proposed"
 
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "alternate"
 msgstr "alternate"
 
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "temporary"
 msgstr "temporary"
 
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "connection"
 msgstr "connection"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3003
 msgid "Color (hex)"
 msgstr "Colour (hex)"
@@ -17993,30 +18331,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:3006
 msgid "route segment"
 msgstr "route segment"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3007
 msgid "forward segment"
 msgstr "forward segment"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3008
 msgid "backward segment"
 msgstr "backward segment"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3009
 msgid "halt point"
 msgstr "halt point"
 
 #. 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"
@@ -22131,7 +22469,19 @@
 msgstr "Terraserver Urban"
 
+#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
+#~ msgstr "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
+
 #~ msgid "Uploading data"
 #~ msgstr "Uploading data"
 
+#~ msgid "Email"
+#~ msgstr "E-Mail"
+
+#~ msgid "Login name (email) to the OSM account."
+#~ msgstr "Login name (e-mail) to the OSM account."
+
+#~ msgid "OSM username (email)"
+#~ msgstr "OSM username (e-mail)"
+
 #~ msgid "Unknown host"
 #~ msgstr "Unknown host"
@@ -22139,4 +22489,11 @@
 #~ msgid "Add either site-josm.xml or Wiki Pages."
 #~ msgstr "Add either site-josm.xml or Wiki Pages."
+
+#~ msgid ""
+#~ "Server returned internal error. Try a reduced area or retry after waiting "
+#~ "some time."
+#~ msgstr ""
+#~ "Server returned internal error. Try a reduced area or retry after waiting "
+#~ "some time."
 
 #~ msgid "Commit comment"
@@ -22194,6 +22551,62 @@
 #~ msgstr "Really mark this issue as ''done''?"
 
+#~ 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 URL.<br><b>Do not use a valuable Password.</b></html>"
+#~ msgstr ""
+#~ "<html>WARNING: The password is stored in plain text in the preferences "
+#~ "file.<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>"
+
 #~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS"
 #~ msgstr "Download Rectified Image from Metacarta's Map Rectifier WMS"
+
+#~ msgid ""
+#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab "
+#~ "- these will then show up in the WMS menu.\n"
+#~ "\n"
+#~ "You can also do this manually in the Advanced Preferences, using the "
+#~ "following schema:\n"
+#~ "wmsplugin.url.1.name=Landsat\n"
+#~ "wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n"
+#~ "wmsplugin.url.2.name=NPE Maps... etc\n"
+#~ "\n"
+#~ "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"
+#~ "\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"
+#~ "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"
+#~ "Note: Make sure the image is suitable, copyright-wise, if in doubt, don't "
+#~ "use."
+#~ msgstr ""
+#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab "
+#~ "- these will then show up in the WMS menu.\n"
+#~ "\n"
+#~ "You can also do this manually in the Advanced Preferences, using the "
+#~ "following schema:\n"
+#~ "wmsplugin.url.1.name=Landsat\n"
+#~ "wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n"
+#~ "wmsplugin.url.2.name=NPE Maps... etc\n"
+#~ "\n"
+#~ "Full WMS URL input format example (landsat)\n"
+#~ "http://onearth.jpl.nasa.gov/wms.cgi?"
+#~ "request=GetMap&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"
+#~ "http://labs.metacarta.com/rectifier/wms.cgi?"
+#~ "id=73&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&\n"
+#~ "format=image/png"
 
 #~ msgid "Portcullis"
@@ -22221,10 +22634,39 @@
 #~ msgstr "viaduct"
 
+#~ msgid "Open the OpenStreetBugs window and activate the automatic download"
+#~ msgstr ""
+#~ "Opens the OpenStreetBugs window and activates the automatic download"
+
 #~ msgid "sports"
 #~ msgstr "sports"
 
+#~ msgid ""
+#~ "Lambert zone {0} in cache  incompatible with current Lambert zone {1}"
+#~ msgstr ""
+#~ "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
+
 #~ msgid "Delete and Download"
 #~ msgstr "Delete and Download"
 
+#~ msgid "No intersections found. Nothing was changed."
+#~ msgstr "No intersection found. Nothing was changed."
+
+#~ msgid ""
+#~ "This action will require {0} individual download requests. Do you wish to "
+#~ "continue?"
+#~ msgstr ""
+#~ "This action will require {0} individual download requests. Do you wish to "
+#~ "continue?"
+
+#~ msgid ""
+#~ "An error occured while trying to match the photos to the GPX track. You "
+#~ "can adjust the sliders to manually match the photos."
+#~ msgstr ""
+#~ "An error occurred while trying to match the photos to the GPX track. You "
+#~ "can adjust the sliders to manually match the photos."
+
+#~ msgid "The following errors occured during mass download:"
+#~ msgstr "The following errors occurred during mass download:"
+
 #~ msgid "Edit Drawbridge"
 #~ msgstr "Edit Drawbridge"
@@ -22232,4 +22674,14 @@
 #~ msgid "Edit Portcullis"
 #~ msgstr "Edit Portcullis"
+
+#~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">english</A>."
+#~ msgstr "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
+
+#~ msgid ""
+#~ "Helppage missing. Create it in <A HREF=\"{0}\">english</A> or <A HREF="
+#~ "\"{1}\">your language</A>."
+#~ msgstr ""
+#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
+#~ "\"{1}\">your language</A>."
 
 #~ msgid ""
@@ -22254,4 +22706,17 @@
 #~ msgstr "Not initialized"
 
+#~ msgid "Cannot read numeric value from response"
+#~ msgstr "Cannot read numeric value from response"
+
 #~ msgid "Data upload failed for unknown reason"
 #~ msgstr "Data upload failed for unknown reason"
+
+#~ msgid "Resolve conflicts in member list of of relation {0}"
+#~ msgstr "Resolve conflicts in member list of relation {0}"
+
+#~ msgid ""
+#~ "Properties in the merged element. They will replace properties in my "
+#~ "elements when  merge decisions are applied."
+#~ msgstr ""
+#~ "Properties in the merged element. They will replace properties in my "
+#~ "elements when merge decisions are applied."
Index: applications/editors/josm/i18n/po/es.po
===================================================================
--- applications/editors/josm/i18n/po/es.po	(revision 16008)
+++ applications/editors/josm/i18n/po/es.po	(revision 16009)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-14 16:51+0200\n"
-"PO-Revision-Date: 2009-06-13 15:25+0000\n"
-"Last-Translator: Emilio Gomez Fernandez <Unknown>\n"
+"POT-Creation-Date: 2009-06-19 21:52+0200\n"
+"PO-Revision-Date: 2009-06-18 21:58+0000\n"
+"Last-Translator: cdavila <cdavilam@jemila.jazztel.es>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-06-14 14:46+0000\n"
+"X-Launchpad-Export-Date: 2009-06-19 19:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -22,17 +22,17 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 msgid "Creating main GUI"
-msgstr "Creando la interfaz de usuario principal"
+msgstr "Creando la interfaz principal de usuario"
 
 #. FIXME why is help not a JosmAction?
 #: ../core/src/org/openstreetmap/josm/Main.java:198
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59
-#: ../core/src/org/openstreetmap/josm/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 "Ayuda"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:261
-msgid "The projection could not be read from preferences. Using Mercartor"
-msgstr "La proyección no puede leerse desde las preferencias. Usando Mercartor"
+msgid "The projection could not be read from preferences. Using Mercator"
+msgstr "La proyección no puede leerse desde las preferencias. Usando Mercator"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:349
@@ -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"
@@ -537,5 +539,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}"
@@ -607,6 +609,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:92
-msgid "Email"
-msgstr "Correo Electrónico"
+msgid "E-Mail"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:96
@@ -644,12 +646,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
@@ -676,5 +680,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
@@ -707,15 +711,13 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:207
 #, java-format
-msgid "Helppage missing. Create it in <A HREF=\"{0}\">english</A>."
-msgstr "Página de ayuda perdida. Crearla en <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 ""
-"Página de ayuda perdida. Crearla en <A HREF=\"{0}\">english</A> or <A HREF="
-"\"{1}\">spanish</A>."
 
 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:26
@@ -1132,11 +1134,11 @@
 "objects too."
 msgstr ""
-"Seleccionar todos los objetos anteriormente eliminados en la capa de datos. "
-"Esto también selecciona los objetos incompletos."
+"Seleccionar todos los objetos no borrados de la capa de datos. Esto también "
+"selecciona los objetos incompletos."
 
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39
 msgid "Show Status Report"
-msgstr "Mostrar Informe de estado"
+msgstr "Mostrar informe de estado"
 
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37
@@ -1151,13 +1153,13 @@
 msgstr "Ayuda: : {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:99
 msgid "Status Report"
 msgstr "Informe de estado"
 
-#: ../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 "Copiar al portapapeles y cerrar"
 
-#: ../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
@@ -1354,12 +1356,10 @@
 msgstr "Deseleccionar todos (Escape)"
 
-#: ../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 "Actualizar datos"
 
-#: ../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 ""
@@ -1367,5 +1367,5 @@
 "de datos)"
 
-#: ../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?"
@@ -1374,89 +1374,259 @@
 "de datos?"
 
-#: ../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 ""
-"Esta acción requiere de {0} solicitudes individuales de descargas. ¿Desea "
-"continuar?"
-
-#: ../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 "Subir a OSM..."
 
-#: ../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 "Subir todos los cambios al servidor OSM."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:96
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:94
 msgid "Objects to add:"
 msgstr "Objetos que añadir"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102
 msgid "Objects to modify:"
 msgstr "Objetos que modificar"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:110
 msgid "Objects to delete:"
 msgstr "Objetos que borrar"
 
-#: ../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 "Introduzca un breve comentario sobre los cambios que se está subiendo:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:126
 msgid "Upload these changes?"
 msgstr "¿Subir estos cambios?"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:130
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
 msgid "Upload Changes"
 msgstr "Subir cambios"
 
-#: ../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 "Nada que subir. Consigue algunos datos primero."
 
-#: ../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 ""
 "Existen algunos conflictos sin resolver. Tienes que solucionarlos primero."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:182
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:180
 msgid "No changes to upload."
 msgstr "Ningún cambio que subir"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:203
 msgid "Uploading"
 msgstr "Subiendo"
 
-#: ../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 "Subida a OSM API fallida"
 
-#: ../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 ""
@@ -1563,37 +1733,51 @@
 msgstr "Datos GPS en bruto"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:44
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:46
 msgid "Downloading data"
 msgstr "Descargando datos"
 
-#: ../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 "No se importó ningún dato."
 
-#: ../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 "Capa de Datos {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 "Datos OpenStreetMap"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:37
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:45
 msgid "Data Layer"
 msgstr "Datos de la capa"
 
-#: ../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 "Descargando {0} de {1} ({2} pendientes)"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:88
-msgid "The following errors occured during mass download:"
-msgstr "Se han producido los siguientes errores durante la descarga masiva:"
-
-#: ../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 "Errores durante la Descarga"
+
+#: ../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
@@ -1619,7 +1803,6 @@
 "when deleting a way. Ctrl: delete referring objects."
 msgstr ""
-"Clique para borrar. Con mayúscula: borrar segmento de vía. Con Alt: no "
-"borrar los nodos sin usar al borrar una vía. Con Ctrl: borrar los objetos "
-"referidos."
+"Clic para borrar. Con mayúscula: borrar segmento de vía. Con Alt: no borrar "
+"los nodos sin usar al borrar una vía. Con Ctrl: borrar los objetos referidos."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:90
@@ -1647,34 +1830,34 @@
 msgstr "No se puede añadir un nodo fuera del mundo."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:495
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:493
 msgid "Add node"
 msgstr "Añadir nodo"
 
-#: ../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 "Añadir nodo a la vía"
 
-#: ../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 "Conectar la vía existente al nodo"
 
-#: ../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 "Añadir un nuevo nodo a la vía existente"
 
-#: ../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 "Añadir un nodo a la vía y conectar"
 
-#: ../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 "Crear un nuevo nodo."
 
-#: ../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 "Seleccione un nodo con el cursor."
 
-#: ../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."
@@ -1683,14 +1866,14 @@
 msgstr[1] "Insertar un nuevo nodo en {0} vías."
 
-#: ../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 "Comenzar una nueva vía desde el último nodo."
 
-#: ../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 "Continuar la vía desde el último nodo."
 
-#: ../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 "Finalizar dibujo."
@@ -1950,5 +2133,5 @@
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
-msgstr "No se ha quitado nada a la selección al buscar \"{0}\""
+msgstr "No se ha quitado nada de la selección al buscar \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187
@@ -2023,26 +2206,32 @@
 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 "Cargar Selección"
 
-#: ../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 "Contacto {0}..."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:45
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:46
 msgid "Downloading..."
 msgstr "Descargando..."
 
-#: ../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 "Imposible leer desde la URL: \"{0}\""
 
-#: ../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 "Error de análisis sintáctico en URL: \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:74
+msgid "Error while communicating with server."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67
@@ -2103,13 +2292,86 @@
 msgstr "Resolver conflictos {0} en objetos {1}"
 
-#: ../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 "Borrar {1} {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97
+#, java-format
+msgid "Delete {0} {1}"
+msgstr "Borrar {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153
+msgid "Conflicting relation"
+msgstr "Relación con conclicto"
+
+#: ../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 ""
+"La selección \"{0}\" está siendo usada por la relación \"{1}\" con el rol "
+"{2}.\n"
+"¿Borrar de la relación?"
+
+#: ../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 "Borrar desde relación"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
+#, java-format
+msgid ""
+"Selection \"{0}\" is used by relation \"{1}\".\n"
+"Delete from relation?"
+msgstr ""
+"La selección \"{0}\" está siendo usada por la relación \"{1}\".\n"
+"¿Borrar de la relación?"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:366
+msgid "Split way segment"
+msgstr "Dividir segmento de vía"
+
+#. 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 ""
+"Está a punto de borrar nodos fuera del área que a bajado.<br>Esto puede "
+"causar problemas ya que otros objetos (que no puede ver) pueden estar "
+"usándolos.<br>¿Realmente quiere borrar?"
+
+#: ../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 "Mover"
+
 #: ../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"
@@ -2118,10 +2380,223 @@
 msgstr[1] "nodos"
 
-#: ../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 "Quitar miembro de la relación"
+
+#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
+msgid "Rotate"
+msgstr "Rotar"
+
+#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88
+msgid "Sequence"
+msgstr "Secuencia"
+
+#: ../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 "¿Aplicar?"
+
+#: ../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 ""
+"Al modificar el sentido de esta vía se sugieren los siguientes cambios en "
+"las propiedades de la vía y sus nodos con el fin de mantener la consistencia "
+"de los datos."
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28
+msgid "Relation"
+msgstr "Relación"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30
+msgid "Old role"
+msgstr "Rol antiguo"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:32
+msgid "New role"
+msgstr "Rol nuevo"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
+msgid "Old key"
+msgstr "Clave antigua"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
+msgid "Old value"
+msgstr "Valor anterior"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
+msgid "New key"
+msgstr "Clave nueva"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
+msgid "New value"
+msgstr "Nuevo valor"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:40
+msgid "Apply selected changes"
+msgstr "Aplicar los cambios seleccionados"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41
+msgid "Don't apply changes"
+msgstr "No aplicar cambios"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:83
+msgid "Please select which property changes you want to apply."
+msgstr ""
+"Por favor, seleccione aquellos cambios de propiedades que desee aplicar."
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:96
+msgid "Properties of "
+msgstr "Propiedades de "
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:120
+msgid "Roles in relations referring to"
+msgstr "Roles en la relaciones referidos a"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:136
+msgid "Automatic tag correction"
+msgstr "Correción automática de etiquetas"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:314
+#, java-format
+msgid "Malformed config file at lines {0}"
+msgstr "Archivo de configurar malformado en lineas {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:324
+#, java-format
+msgid "Cannot open preferences directory: {0}"
+msgstr "No se puede abrir el directorio de preferencias: {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 ""
+"El archivo de preferencias contiene errores. Realizando copia de seguridad "
+"de uno antiguo a {0}."
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:79
+#, java-format
+msgid "Preferences stored on {0}"
+msgstr "Preferencias guardadas en {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:82
+#, java-format
+msgid "Could not upload preferences. Reason: {0}"
+msgstr "No se han podido subir las preferencias. Ya que: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:93
+msgid "Could not load preferences from server."
+msgstr "No se han podido cargar las preferencias desd el servidor."
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:34
+msgid "different"
+msgstr "diferente"
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:262
+msgid "deleted"
+msgstr "borrado"
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
+msgid "true"
+msgstr "verdadero"
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
+msgid "false"
+msgstr "falso"
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20
+msgid "position"
+msgstr "posición"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30
+msgid "Decimal Degrees"
+msgstr "Grados decimales"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
+msgid "Degrees Minutes Seconds"
+msgstr "Grados minutos segundos"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+msgid "S"
+msgstr "S"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+msgid "N"
+msgstr "N"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+msgid "W"
+msgstr "O"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+msgid "E"
+msgstr "E"
+
+#: ../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 "incompleto"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
+#, java-format
+msgid "Error: {0}"
+msgstr "Error: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
+#, java-format
+msgid "Warning: {0}"
+msgstr "Advertencia: {0}"
+
+#: ../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"
@@ -2130,8 +2605,10 @@
 msgstr[1] "vías"
 
-#: ../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
@@ -2142,270 +2619,27 @@
 msgstr[1] "relaciones"
 
-#: ../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 "Borrar {1} {0}"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97
-#, java-format
-msgid "Delete {0} {1}"
-msgstr "Borrar {0} {1}"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153
-msgid "Conflicting relation"
-msgstr "Relación con conclicto"
-
-#: ../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 ""
-"La selección \"{0}\" está siendo usada por la relación \"{1}\" con el rol "
-"{2}.\n"
-"¿Borrar de la relación?"
-
-#: ../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 "Borrar desde relación"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
-#, java-format
-msgid ""
-"Selection \"{0}\" is used by relation \"{1}\".\n"
-"Delete from relation?"
-msgstr ""
-"La selección \"{0}\" está siendo usada por la relación \"{1}\".\n"
-"¿Borrar de la relación?"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:366
-msgid "Split way segment"
-msgstr "Dividir segmento de vía"
-
-#. 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 ""
-"Está a punto de borrar nodos fuera del área que a bajado.<br>Esto puede "
-"causar problemas ya que otros objetos (que no puede ver) pueden estar "
-"usándolos.<br>¿Realmente quiere borrar?"
-
-#: ../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 "Mover"
-
-#: ../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 "Quitar miembro de la relación"
-
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
-msgid "Rotate"
-msgstr "Rotar"
-
-#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88
-msgid "Sequence"
-msgstr "Secuencia"
-
-#: ../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 "¿Aplicar?"
-
-#: ../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 ""
-"Al modificar el sentido de esta vía se sugieren los siguientes cambios en "
-"las propiedades de la vía y sus nodos con el fin de mantener la consistencia "
-"de los datos."
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28
-msgid "Relation"
-msgstr "Relación"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30
-msgid "Old role"
-msgstr "Rol antiguo"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:32
-msgid "New role"
-msgstr "Rol nuevo"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
-msgid "Old key"
-msgstr "Clave antigua"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
-msgid "Old value"
-msgstr "Valor anterior"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
-msgid "New key"
-msgstr "Clave nueva"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
-msgid "New value"
-msgstr "Nuevo valor"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:40
-msgid "Apply selected changes"
-msgstr "Aplicar los cambios seleccionados"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41
-msgid "Don't apply changes"
-msgstr "No aplicar cambios"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:83
-msgid "Please select which property changes you want to apply."
-msgstr ""
-"Por favor, seleccione aquellos cambios de propiedades que desee aplicar."
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:96
-msgid "Properties of "
-msgstr "Propiedades de "
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:120
-msgid "Roles in relations referring to"
-msgstr "Roles en la relaciones referidos a"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:136
-msgid "Automatic tag correction"
-msgstr "Correción automática de etiquetas"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:314
-#, java-format
-msgid "Malformed config file at lines {0}"
-msgstr "Archivo de configurar malformado en lineas {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:324
-#, java-format
-msgid "Cannot open preferences directory: {0}"
-msgstr "No se puede abrir el directorio de preferencias: {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 ""
-"El archivo de preferencias contiene errores. Realizando copia de seguridad "
-"de uno antiguo a {0}."
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:79
-#, java-format
-msgid "Preferences stored on {0}"
-msgstr "Preferencias guardadas en {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:82
-#, java-format
-msgid "Could not upload preferences. Reason: {0}"
-msgstr "No se han podido subir las preferencias. Ya que: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:93
-msgid "Could not load preferences from server."
-msgstr "No se han podido cargar las preferencias desd el servidor."
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:34
-msgid "different"
-msgstr "diferente"
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:262
-msgid "deleted"
-msgstr "borrado"
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
-msgid "true"
-msgstr "verdadero"
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
-msgid "false"
-msgstr "falso"
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20
-msgid "position"
-msgstr "posición"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30
-msgid "Decimal Degrees"
-msgstr "Grados decimales"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
-msgid "Degrees Minutes Seconds"
-msgstr "Grados minutos segundos"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
-msgid "S"
-msgstr "S"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
-msgid "N"
-msgstr "N"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
-msgid "W"
-msgstr "O"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
-msgid "E"
-msgstr "E"
-
-#: ../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 "incompleto"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
-#, java-format
-msgid "Error: {0}"
-msgstr "Error: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
-#, java-format
-msgid "Warning: {0}"
-msgstr "Advertencia: {0}"
-
-#: ../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"
@@ -2419,5 +2653,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:122
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "railway"
 msgstr "Ferrocarril"
@@ -2439,4 +2673,62 @@
 msgstr[1] "{0} nodos"
 
+#: ../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."
@@ -2584,5 +2876,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 "fondo"
@@ -2671,8 +2963,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
@@ -2684,7 +2976,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
@@ -2791,10 +3083,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 "Nombre de usuario"
 
 #: ../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 "Contraseña"
@@ -2891,22 +3183,22 @@
 msgstr "La opción de configuración {0} ha sido eliminada y ya no se usa"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:146
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148
 msgid "File"
 msgstr "Archivo"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150
 msgid "View"
 msgstr "Vista"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:149
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151
 msgid "Tools"
 msgstr "Herramientas"
 
-#: ../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 "Predefinidos"
 
-#: ../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
@@ -2919,21 +3211,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 "Vista de rejilla"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:218
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221
 msgid "Toggle Wireframe view"
 msgstr "Interruptor de la vista de rejilla"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:244
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:247
 msgid "Full Screen"
 msgstr "Pantalla completa"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:246
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:249
 msgid "Toggle Full Screen view"
 msgstr "Cambiar vista a pantalla completa"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:286
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:289
 msgid "Audio"
 msgstr "Audio"
@@ -3005,6 +3297,6 @@
 msgstr "(sin objeto)"
 
-#: ../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 "capa no listada"
@@ -3014,9 +3306,9 @@
 msgstr "Contactando con el servidor OSM..."
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:104
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:105
 msgid "Error while parsing"
 msgstr "Error mientras se analizaba sintácticamente"
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:107
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:108
 msgid "File not found"
 msgstr "Archivo no encontrado."
@@ -3088,5 +3380,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 "Miembros"
@@ -3282,5 +3574,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
@@ -3362,5 +3654,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 ""
@@ -3399,5 +3691,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 ""
 
@@ -3451,5 +3743,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 "Rol"
@@ -3553,5 +3845,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
@@ -3868,5 +4160,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 "Relaciones"
@@ -3973,66 +4265,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 "Aplicar cambios"
 
-#: ../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 "Básico"
 
-#: ../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 "Ocupado por"
 
-#: ../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 "enlazado"
 
-#: ../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 "Etiquetas (un valor nulo borra la etiqueta)"
 
-#: ../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 "Mover hacia arriba"
 
-#: ../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 "Mover los miembro(s) seleccionos hacia arriba"
 
-#: ../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 "Añadir seleccionado"
 
-#: ../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 "Añadir todos los objetos"
 
-#: ../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 "Eliminar seleccionados"
 
-#: ../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 "Eliminar todos los objetos seleccionados de la relación"
 
-#: ../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 "Mueve hacia abajo"
 
-#: ../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 "Mover los miembros seleccionados hacia abajo"
 
-#: ../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 "Quitar el miembro en la fila de tabla actual de esta relación"
 
-#: ../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 "Descargar miembros"
 
-#: ../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 "Descargar todas las vías y nodos incompletos de esta relación"
@@ -4077,5 +4369,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
@@ -4096,9 +4388,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 "sí"
 
-#: ../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
@@ -4120,31 +4412,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 "no"
 
-#: ../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 "Miembros: {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 "Editor de relación: {0}"
 
-#: ../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 "Existieron conflictos durante la importación"
 
-#: ../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 "Error analizando la respuesta del servidor"
 
-#: ../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 "No se puede conectar con el servidor"
+
+#: ../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
@@ -4209,13 +4504,13 @@
 msgstr "Fuentes de datos y tipos"
 
-#: ../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 "Descargar como nueva capa"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:174
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:173
 msgid "Download Area"
 msgstr "Descargar área"
 
-#: ../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 ""
@@ -4223,5 +4518,5 @@
 "servidor"
 
-#: ../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 ""
@@ -4251,5 +4546,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 "Lugares"
@@ -4296,21 +4591,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 "tipo"
@@ -4350,15 +4645,4 @@
 msgid "Tile Numbers"
 msgstr "Números de teselas"
-
-#: ../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 ""
-"Puede usar el ratón o las teclas Ctrl+Flecha para hacer zoom y desplazamiento"
-
-#. 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 "Mapa"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:98
@@ -4438,5 +4722,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)"
@@ -4552,14 +4836,14 @@
 msgstr "archivos Wave Audio (*.wav)"
 
-#: ../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 "Marcadores de audio desde {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244
 msgid "Import images"
 msgstr "Importar imágenes"
 
-#: ../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, "
@@ -4568,5 +4852,5 @@
 msgstr[1] "{0} trazas, "
 
-#: ../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, "
@@ -4575,5 +4859,5 @@
 msgstr[1] "{0} rutas, "
 
-#: ../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"
@@ -4582,28 +4866,28 @@
 msgstr[1] "{0} nodos de vía"
 
-#: ../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 "Nombre: {0}"
 
-#: ../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 "Descripción: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347
 msgid "Timespan: "
 msgstr "Rango de tiempo "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354
 msgid "Length: "
 msgstr "Longitud: "
 
-#: ../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 "Convertir en capa de datos"
 
-#: ../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 ""
@@ -4614,11 +4898,11 @@
 "peligroso.<br>Si quiere subir trazas, consulte aquí:"
 
-#: ../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 (EN)"
 
-#: ../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
@@ -4628,29 +4912,29 @@
 msgstr "Convertido desde: {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 "Descargar datos de OSM a lo largo de esta traza"
 
-#: ../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 "Descargar todo entre:"
 
-#: ../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 "{0} metros"
 
-#: ../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 "Área máxima por petición:"
 
-#: ../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 "{0} km2"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:822
 #, java-format
 msgid ""
@@ -4661,9 +4945,9 @@
 "<br¿Desea continuar?</html>"
 
-#: ../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 "No hay traza gpx disponible en la capa para asociar el audio"
 
-#: ../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 "
@@ -4674,5 +4958,5 @@
 "comienzo."
 
-#: ../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 "
@@ -4682,33 +4966,42 @@
 "tiempos fueran razonablemente estimados se han omitido."
 
-#: ../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 "fuera del área descargada"
 
-#: ../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 "versión {0}"
 
-#: ../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 "{0} formado por:"
 
-#: ../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} borrados.)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:371
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:396
 msgid "unset"
 msgstr "sin ajustar"
 
-#: ../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 "Versión del API: {0}"
 
-#: ../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"
@@ -4716,21 +5009,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"
@@ -4882,5 +5175,5 @@
 "usado todavía)"
 
-#: ../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
@@ -4889,5 +5182,5 @@
 msgstr "Por favor, seleccione la fila a editar"
 
-#: ../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
@@ -4895,5 +5188,5 @@
 msgstr "Nuevo valor de {0}"
 
-#: ../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
@@ -4903,5 +5196,5 @@
 msgstr "Por favor, seleccione la fila a borrar"
 
-#: ../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 "Introduzca un par parámetro/valor"
@@ -5798,106 +6091,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 "Nombre"
@@ -6382,6 +6675,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:36
-msgid "Login name (email) to the OSM account."
-msgstr "Validar nombre (correo-e) de la cuenta OSM"
+msgid "Login name (e-mail) to the OSM account."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
@@ -6397,6 +6690,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
-msgid "OSM username (email)"
-msgstr "Nombre de usuario OSM (correo electrónico)"
+msgid "OSM username (e-mail)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
@@ -6407,10 +6700,7 @@
 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 ""
-"<html>ATENCIÓN: La contraseña está almacenada en texto plano en el archivo "
-"de preferencias.<br>La clave será transferida en texto plano al servidor, "
-"codificada en la URL.<br><b>No usar una contraseña importante.</b></html>"
 
 #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on
@@ -6731,6 +7021,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 "Contactando con el servidor OSM..."
@@ -6741,7 +7032,7 @@
 msgstr "Descargando puntos {0} al {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 "Descargando datos OSM..."
@@ -6808,15 +7099,14 @@
 msgstr "¡Fallo en la importación NMEA!"
 
-#: ../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 "Esta versión de JOSM es incompatible con el servidor configurado"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:207
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172
 #, java-format
 msgid ""
@@ -6827,31 +7117,37 @@
 "{0} a {1}"
 
-#: ../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 "Establecidas comunicaciones con {0} usando la versión de protocolo {1}"
 
-#: ../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 "No se puede leer el valor numérico de la respuesta"
-
-#: ../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 "Abriendo conjunto de cambios..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:351
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298
 msgid "Closing changeset..."
 msgstr "Cerrando conjunto de cambios..."
 
-#: ../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 "Sin nuevos cambios que enviar"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:376
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:321
 msgid "Preparing..."
 msgstr "Preparando…"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:381
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:326
 msgid "Uploading..."
 msgstr "Subiendo..."
@@ -6866,25 +7162,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 "Contraseña o nombre de usuario incorrectos"
 
-#: ../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 "Advertencia: La contraseña se transferirá sin cifrar."
 
-#: ../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 "Grabar nombre de usuario y contraseña (sin cifrar)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:89
 msgid "Enter Password"
 msgstr "Introduzca contraseña"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
 msgid "Login"
 msgstr "Inicio de sesión"
 
-#: ../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..."
@@ -6895,4 +7191,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."
@@ -6990,9 +7329,23 @@
 msgstr "id del nodo mal formado"
 
-#: ../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 "Contactando con el servidor..."
 
-#: ../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."
@@ -7001,17 +7354,9 @@
 "conexión a Internet."
 
-#: ../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 ""
-"El servidor devolvió un error interno. Reduzca el área o reinténtelo más "
-"tarde."
-
-#: ../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 ""
 
@@ -7027,5 +7372,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 "Descarga de complementos"
@@ -7220,9 +7565,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 "Descargar los complementos que faltan"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:128
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:119
 #, java-format
 msgid ""
@@ -7235,6 +7580,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
@@ -7257,35 +7602,35 @@
 msgstr "desconocido"
 
-#: ../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}: Versión {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 "Complemento incluido en JOSM"
 
-#: ../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 "Error al leer el archivo de información del complemento: {0}"
 
-#: ../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 "Esto está despues del final de la grabación"
 
-#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:329
+#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:340
 msgid "Error playing sound"
 msgstr "Error reproduciendo sonido"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
 msgid "Do nothing"
 msgstr "No hacer nada"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
 msgid "Report Bug"
 msgstr "Informar del error"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:52
 msgid ""
 "An unexpected exception occurred.\n"
@@ -7300,18 +7645,18 @@
 "de JOSM, por favor, considere enviar un informe de error."
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55
 msgid "Unexpected Exception"
 msgstr "Excepción inesperada"
 
-#: ../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 "Por favor presente una \"ticket\" en {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 "Incluya los pasos previos al error (lo más detalladamente posible)"
 
-#: ../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 "
@@ -7321,9 +7666,9 @@
 "complementos antes de comunicar un fallo."
 
-#: ../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 "Asegúrese de incluir la siguiente información:"
 
-#: ../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 "(El texto ya ha sido copiado a tu portapapeles.)"
@@ -7410,5 +7755,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 "Descripción"
@@ -7795,9 +8140,7 @@
 #: ../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 ""
-"Se ha producido un error al tratar de hacer coincidir las fotografías con la "
-"traza GPX. Puede ajustarlo regulándolo manualmente para hacer coincidirlos.\""
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:853
@@ -7829,5 +8172,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"
@@ -7850,5 +8192,5 @@
 msgstr "Archivo caché de la zona Lambert 4 (.4)"
 
-#: ../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
@@ -7945,6 +8287,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/"
@@ -8038,6 +8380,6 @@
 msgstr "¿Añadir etiqueta sobre la fuente a los elementos (source=...)?"
 
-#: ../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
@@ -8045,11 +8387,11 @@
 msgstr "Descargando {0}"
 
-#: ../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 "Contactando con servidor WMS..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:157
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:158
 msgid "Create buildings"
 msgstr "Crear edificios"
@@ -8069,13 +8411,13 @@
 "Por favor, active el autoabastecimiento y compruebe el catastro Millesime."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:61
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:62
 msgid "Extract SVG ViewBox..."
 msgstr "Extraer SVG de la caja de vista..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:65
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:66
 msgid "Extract best fitting boundary..."
 msgstr "Extaer el mejor ajuste de frontera..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:126
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:127
 msgid "Create boundary"
 msgstr "Crear frontera"
@@ -8096,5 +8438,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 "Descargando imágenes desde el servidor francés WMS del Catastro"
 
@@ -8193,5 +8535,5 @@
 "Seleccione primero una de ellas y reinténtelo"
 
-#: ../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
@@ -8199,59 +8541,28 @@
 msgstr "Capa en blanco"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:176
 #, java-format
 msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr "Capa WMS ({0}), {1} tesela(s) cargada"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:183
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:178
 msgid "Is not vectorized."
 msgstr "No está vectorizado."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:179
 #, java-format
 msgid "Raster center: {0}"
 msgstr "Centro de la imágen ráster: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181
 msgid "Is vectorized."
 msgstr "Está vectorizado."
 
-#: ../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 "Cuadro de la Comunna: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:282
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
-msgid "Save WMS layer to file"
-msgstr "Guardar capa WMS como archivo"
-
-#: ../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 "Cargar capa WMS desde archivo"
-
-#: ../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 "Versión de archivo WMS no soportada; encontrada {0}, esperada {1}"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:325
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:335
-msgid "File Format Error"
-msgstr "Error en el formato del archivo"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:481
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:401
 #, java-format
 msgid ""
@@ -8262,15 +8573,14 @@
 "Creado uno nuevo."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:482
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402
 msgid "Cache Format Error"
 msgstr "Error en el formato caché"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:497
-#, java-format
-msgid "Lambert zone {0} in cache  incompatible with current Lambert zone {1}"
-msgstr ""
-"Zona Lambert {0} en la caché incompatible con la zona Lambert  actual {1}"
-
-#: ../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 "Error en la zona Lambert  de la caché"
@@ -8368,11 +8678,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 "Importar camino de capa gpx"
 
 #: ../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 "Soltar camino existente"
@@ -8382,5 +8692,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 "No se encontró la capa de datos GPX"
@@ -8671,4 +8981,8 @@
 msgid "Lakewalker trace"
 msgstr "Traza Lakewalker"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:10
+msgid "An unknown error has occurred"
+msgstr ""
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
@@ -8992,43 +9306,43 @@
 msgstr "LiveGPS"
 
-#: ../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 "Valores medidos"
 
-#: ../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 "Abrir la ventana de medidas."
 
-#: ../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 "Reiniciar"
 
-#: ../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 ""
 "Reiniciar los resultados de medidas actuales y borrar el camino de medida."
 
-#: ../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 "Longitud del recorrido"
 
-#: ../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 "Longitud de la selección"
 
-#: ../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 "Área de la selección"
 
-#: ../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 "Ángulo"
 
-#: ../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 "Ángulo entre dos nodos seleccionados"
 
-#: ../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 "Capa para mediciones"
@@ -9089,6 +9403,6 @@
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
-msgid "Open the OpenStreetBugs window and activate the automatic download"
-msgstr "Abre la ventana de OpenStreetBugs y activa la descarga automática"
+msgid "Opens the OpenStreetBugs window and activates the automatic download"
+msgstr ""
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:123
@@ -9167,5 +9481,5 @@
 msgstr "Osmarender"
 
-#: ../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 "
@@ -9175,9 +9489,9 @@
 "pestaña Configuraciones del Mapa del menú Preferencias."
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:123
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:127
 msgid "osmarender options"
 msgstr "Opciones de osmarender"
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:124
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:128
 msgid "Firefox executable"
 msgstr "Ejecutable Firefox"
@@ -9614,5 +9928,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 "Nombre de la calle"
@@ -9707,6 +10021,6 @@
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:195
-msgid "No intersections found. Nothing was changed."
-msgstr "Ninguna intersección encontrada. No se han producido cambios."
+msgid "No intersection found. Nothing was changed."
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:217
@@ -10609,45 +10923,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 ""
-"Puede añadir, editar y borrar entradas de servicios WMS en la pestaña "
-"Preferencias del componente WMSplugin. Una vez modificado estos cambios se "
-"mostrarán en el menú WMS.\n"
-"\n"
-"También puede hacerlo manualmente en 'Preferencias avanzadas' usando el "
-"siguiente esquema:\n"
-"wmsplugin.url.1.name=Landsat\n"
-"wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n"
-"wmsplugin.url.2.name=NPE Maps... etc\n"
-"\n"
-"Ejemplo del formato de una URL completa del servicio WMS para Landsat\n"
-"http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n"
-"layers=global_mosaic&styles=&srs=EPSG:4326&\n"
-"format=image/jpeg \n"
-"\n"
-"Para el restificador de mapas de Metacarta http://labs.metacarta.com/"
-"rectifier/ únicamente necesita introducir el identificador 'id' que este "
-"servicio le proporciona.\n"
-"Para agregar una imagen de un mapa rectificada mediante esta utilidad de "
-"Metacarta sustituya en esta URL de ejemplo el número 73 por el id que "
-"identifica a su imagen: \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"
-"Nota: Asegúrese que los derechos de autor de la imagen que vaya a utilizar "
-"se adecúan a la licencia de OSM. Si duda, por favor, no la utilice."
-
-#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:54
+
+#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:53
 msgid "WMS Plugin Help"
 msgstr "Ayuda del componente WMS"
@@ -10706,5 +10993,5 @@
 msgstr "Ajustar la posición de la capa WMS seleccionada"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113
 #, java-format
 msgid ""
@@ -10752,4 +11039,29 @@
 msgid "Alpha channel"
 msgstr "Canal alfa"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
+msgid "Save WMS layer to file"
+msgstr "Guardar capa WMS como archivo"
+
+#: ../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 "Cargar capa WMS desde archivo"
+
+#: ../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 "Versión de archivo WMS no soportada; encontrada {0}, esperada {1}"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:335
+msgid "File Format Error"
+msgstr "Error en el formato del archivo"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:163
@@ -10849,4 +11161,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 "Debe hacer públicas sus ediciones para subir nuevos datos"
@@ -10863,5 +11180,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 ""
 "Componente para utilizar el servidor WMS del registro de la propiedad del "
@@ -11195,5 +11512,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 "Referencia"
@@ -11695,5 +12012,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 "Anchura (metros)"
@@ -12162,7 +12479,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 "Tipo"
@@ -12779,10 +13096,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 "Operador"
@@ -12814,5 +13131,5 @@
 #: build/trans_presets.java:1306
 msgid "traffic_signals"
-msgstr "señales de tráfico"
+msgstr "semáforos"
 
 #: build/trans_presets.java:758 build/trans_presets.java:773
@@ -12994,7 +13311,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 "Altitud"
@@ -13926,5 +14243,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 "De pago"
@@ -14060,5 +14377,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 "Referencia (número de pista)"
@@ -14066,5 +14383,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 "Área"
@@ -14116,11 +14433,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 "Refugio"
+
+#. item "Public Transport/Bus Stop" check "Shelter"
 #. </optional>
-#: build/trans_presets.java:1503
+#: build/trans_presets.java:1504
 msgid "Bus Platform"
 msgstr "Andén de autobús"
 
 #. item
-#: build/trans_presets.java:1504
+#: build/trans_presets.java:1505
 msgid "Edit Bus Platform"
 msgstr "Editar andén de autobús"
@@ -14128,5 +14455,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1512
+#: build/trans_presets.java:1513
 msgid "Taxi"
 msgstr "Taxi"
@@ -14134,5 +14461,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 "Editar parada de taxi"
@@ -14140,5 +14467,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1519
+#: build/trans_presets.java:1520
 msgid "Airport"
 msgstr "Aeropuerto"
@@ -14146,15 +14473,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 "Editar Aeropuerto"
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1526
+#: build/trans_presets.java:1527
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1527
+#: build/trans_presets.java:1528
 msgid "ICAO"
 msgstr "ICAO"
@@ -14163,5 +14490,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1532
+#: build/trans_presets.java:1533
 msgid "Accomodation"
 msgstr "Alojamiento"
@@ -14173,5 +14500,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 "Hotel"
@@ -14180,15 +14507,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 "Editar hotel"
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1539
+#: build/trans_presets.java:1540
 msgid "Stars"
 msgstr "Estrellas"
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1541
+#: build/trans_presets.java:1542
 msgid "Motel"
 msgstr "Motel"
@@ -14196,20 +14523,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 "Editar motel"
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1547
+#: build/trans_presets.java:1548
 msgid "Guest House"
 msgstr "Pensión"
 
 #. item
-#: build/trans_presets.java:1548
+#: build/trans_presets.java:1549
 msgid "Edit Guest House"
 msgstr "Editar pensión"
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1552
+#: build/trans_presets.java:1553
 msgid "Chalet"
 msgstr "Chalet"
@@ -14217,10 +14544,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 "Editar chalet"
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1558
+#: build/trans_presets.java:1559
 msgid "Hostel"
 msgstr "Albergue"
@@ -14228,30 +14555,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 "Editar albergue"
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1564
+#: build/trans_presets.java:1565
 msgid "Alpine Hut"
 msgstr "Cabaña alpina"
 
 #. item
-#: build/trans_presets.java:1565
+#: build/trans_presets.java:1566
 msgid "Edit Alpine Hut"
 msgstr "Editar cabaña alpina"
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1570
+#: build/trans_presets.java:1571
 msgid "Caravan Site"
 msgstr "Zona de caravanas"
 
 #. item
-#: build/trans_presets.java:1571
+#: build/trans_presets.java:1572
 msgid "Edit Caravan Site"
 msgstr "Editar zona de caravanas"
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1575
+#: build/trans_presets.java:1576
 msgid "Camping Site"
 msgstr "Lugar de acampada"
@@ -14259,10 +14586,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 "Editar lugar de acampada"
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1582
+#: build/trans_presets.java:1583
 msgid "Food+Drinks"
 msgstr "Comida+Bebidas"
@@ -14273,5 +14600,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 "Restaurante"
@@ -14279,5 +14606,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 "Editar restaurante"
@@ -14285,5 +14612,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 "Cocina"
@@ -14291,61 +14618,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 "italiano"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "chinese"
 msgstr "chino"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "pizza"
 msgstr "pizzería"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "burger"
 msgstr "hamburguesería"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "greek"
 msgstr "griego"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "german"
 msgstr "alemán"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "indian"
 msgstr "india"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "regional"
 msgstr "regional"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "turkish"
 msgstr "turco"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "asian"
 msgstr "asiático"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "thai"
 msgstr "tailandés"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "mexican"
 msgstr "mexicano"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "japanese"
 msgstr "japonés"
 
-#: build/trans_presets.java:1590
+#: build/trans_presets.java:1591
 msgid "Fast Food"
 msgstr "Establecimiento de comida rápida"
@@ -14353,9 +14680,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 "Editar establecimiento de comida rápida"
 
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1598
 msgid "Cafe"
 msgstr "Cafetería"
@@ -14363,10 +14690,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 "Editar cafetería"
 
 #. item "Food+Drinks/Cafe" text "Name"
-#: build/trans_presets.java:1603
+#: build/trans_presets.java:1604
 msgid "Pub"
 msgstr "Bar"
@@ -14374,20 +14701,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 "Editar bar"
 
 #. item "Food+Drinks/Pub" text "Name"
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1610
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item
-#: build/trans_presets.java:1610
+#: build/trans_presets.java:1611
 msgid "Edit Biergarten"
 msgstr "Editar biergarten"
 
 #. item "Food+Drinks/Biergarten" text "Name"
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1615
 msgid "Bar"
 msgstr "Bar"
@@ -14395,10 +14722,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 "Editar Bar"
 
 #. item "Food+Drinks/Bar" text "Name"
-#: build/trans_presets.java:1620
+#: build/trans_presets.java:1621
 msgid "Nightclub"
 msgstr "Club nocturno"
@@ -14406,20 +14733,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 "Editar club nocturno"
 
 #. item "Food+Drinks/Nightclub" text "Name"
-#: build/trans_presets.java:1627
+#: build/trans_presets.java:1628
 msgid "Tourism"
 msgstr "Turismo"
 
 #. group "Tourism"
-#: build/trans_presets.java:1628
+#: build/trans_presets.java:1629
 msgid "Attraction"
 msgstr "Atracción"
 
 #. item
-#: build/trans_presets.java:1629
+#: build/trans_presets.java:1630
 msgid "Edit Attraction"
 msgstr "Editar atracción"
@@ -14428,11 +14755,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 "Horario de apertura"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1634
+#: build/trans_presets.java:1635
 msgid "Museum"
 msgstr "Museo"
@@ -14440,10 +14767,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 "Editar museo"
 
 #. item "Tourism/Museum" text "Name"
-#: build/trans_presets.java:1640
+#: build/trans_presets.java:1641
 msgid "Zoo"
 msgstr "Zoo"
@@ -14452,10 +14779,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 "Editar zoo"
 
 #. item "Tourism/Zoo" text "Name"
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1648
 msgid "Viewpoint"
 msgstr "Panorámica"
@@ -14463,25 +14790,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 "Editar panorámica"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1652
+#: build/trans_presets.java:1653
 msgid "Look-Out Tower"
 msgstr "Torre de vigía"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1654
+#: build/trans_presets.java:1655
 msgid "Theme Park"
 msgstr "Parque temático"
 
 #. item
-#: build/trans_presets.java:1655
+#: build/trans_presets.java:1656
 msgid "Edit Theme Park"
 msgstr "Editar parque temático"
 
 #. item "Tourism/Theme Park" text "Name"
-#: build/trans_presets.java:1659
+#: build/trans_presets.java:1660
 msgid "Artwork"
 msgstr "Trabajo artístico"
@@ -14489,5 +14816,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 "Editar trabajo artístico"
@@ -14495,5 +14822,5 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1667
 msgid "Information Office"
 msgstr "Oficina de información"
@@ -14501,83 +14828,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 "Editar oficina de información"
 
+#. item "Tourism/Information Office" text "Opening Hours"
+#: build/trans_presets.java:1675
+msgid "Map"
+msgstr "Mapa"
+
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1679
 msgid "Map Type"
 msgstr "Tipo de Mapa"
 
 #. item "Tourism/Map" combo "Map Type"
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1679
 msgid "map"
 msgstr "mapa"
 
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1679
 msgid "citymap"
 msgstr "callejero"
 
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1679
 msgid "hikingmap"
 msgstr "topoguía"
 
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1679
 msgid "bicyclemap"
 msgstr "mapa ciclable"
 
 #. 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 "Descripción detallada"
 
 #. item "Tourism/Map" text "Closer Description"
-#: build/trans_presets.java:1681
+#: build/trans_presets.java:1682
 msgid "Information Board"
 msgstr "Panel informativo"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1686
 msgid "Board Type"
 msgstr "Tipo de Cartel"
 
 #. item "Tourism/Information Board" combo "Board Type"
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1686
 msgid "board"
 msgstr "cartel"
 
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1686
 msgid "history"
 msgstr "historia"
 
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1686
 msgid "nature"
 msgstr "naturaleza"
 
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1686
 msgid "wildlife"
 msgstr "vida salvaje"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1688
+#: build/trans_presets.java:1689
 msgid "Guidepost (Hiking)"
 msgstr "Hito direccional (excursionismo)"
 
 #. item "Tourism/Guidepost (Hiking)" text "Elevation"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1696
 msgid "Other Information Points"
 msgstr "Otros Puntos de Información"
 
-#. 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 "Refugio"
-
-#. item
-#: build/trans_presets.java:1703
+#. item
+#: build/trans_presets.java:1704
 msgid "Edit Shelter"
 msgstr "Editar refugio"
@@ -14585,25 +14909,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 "Barbacoa"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1709
 msgid "Picnic Site"
 msgstr "Zona de picnic"
 
 #. item
-#: build/trans_presets.java:1709
+#: build/trans_presets.java:1710
 msgid "Edit Picnic Site"
 msgstr "Editar zona de picnic"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1716
 msgid "Historic Places"
 msgstr "Lugares históricos"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1716
+#: build/trans_presets.java:1717
 msgid "Castle"
 msgstr "Castillo"
@@ -14612,20 +14936,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 "Editar castillo"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1724
 msgid "Ruins"
 msgstr "Ruinas"
 
 #. item
-#: build/trans_presets.java:1724
+#: build/trans_presets.java:1725
 msgid "Edit Ruins"
 msgstr "Editar ruinas"
 
 #. item "Historic Places/Ruins" text "Name"
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1729
 msgid "Archaeological Site"
 msgstr "Lugar arqueológico"
@@ -14634,10 +14958,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 "Editar lugar arqueológico"
 
 #. item "Historic Places/Archaeological Site" text "Name"
-#: build/trans_presets.java:1735
+#: build/trans_presets.java:1736
 msgid "Battlefield"
 msgstr "Campo de batalla"
@@ -14645,5 +14969,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 "Editar campo de batalla"
@@ -14651,15 +14975,15 @@
 #. item "Historic Places/Battlefield" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1743
 msgid "Monument"
 msgstr "Monumento"
 
 #. item
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1744
 msgid "Edit Monument"
 msgstr "Editar monumento"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1748
 msgid "Memorial"
 msgstr "Monumento conmemorativo"
@@ -14667,45 +14991,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 "Editar monumento conmemorativo"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1753
+#: build/trans_presets.java:1754
 msgid "Wayside Cross"
 msgstr "Crucero"
 
 #. item
-#: build/trans_presets.java:1754
+#: build/trans_presets.java:1755
 msgid "Edit Wayside Cross"
 msgstr "Editar crucero"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1758
+#: build/trans_presets.java:1759
 msgid "Wayside Shrine"
 msgstr "Humilladero"
 
 #. item
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1760
 msgid "Edit Wayside Shrine"
 msgstr "Editar humilladero"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1765
 msgid "Leisure"
 msgstr "Ocio"
 
 #. group "Leisure"
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1766
 msgid "Water Park"
 msgstr "Parque acuático"
 
 #. item
-#: build/trans_presets.java:1766
+#: build/trans_presets.java:1767
 msgid "Edit Water Park"
 msgstr "Editar parque acuático"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1770
+#: build/trans_presets.java:1771
 msgid "Playground"
 msgstr "Zona de juegos"
@@ -14713,15 +15037,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 "Editar zona de juegos"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1776
+#: build/trans_presets.java:1777
 msgid "Fishing"
 msgstr "Pesca"
 
 #. item
-#: build/trans_presets.java:1777
+#: build/trans_presets.java:1778
 msgid "Edit Fishing"
 msgstr "Editando pesca"
@@ -14729,15 +15053,15 @@
 #. item "Leisure/Fishing" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1783
+#: build/trans_presets.java:1784
 msgid "Sport Facilities"
 msgstr "Instalaciones deportivas"
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1784
+#: build/trans_presets.java:1785
 msgid "Stadium"
 msgstr "Estadio"
 
 #. item
-#: build/trans_presets.java:1785
+#: build/trans_presets.java:1786
 msgid "Edit Stadium"
 msgstr "Editar estadio"
@@ -14751,6 +15075,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 "seleccionar deporte:"
@@ -15126,6 +15450,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
@@ -15158,227 +15482,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 "diversos"
 
-#: 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 "tiro con arco"
 
-#: 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 "atletismo"
 
-#: 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 "fútbol australiano"
 
-#: 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 "béisbol"
 
-#: 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 "baloncesto"
 
-#: 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 "boules"
 
-#: 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 "bolos"
 
-#: 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 "piragua"
 
-#: 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 "escalada"
 
-#: 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 "cricket"
 
-#: 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 "Cricket con redes"
 
-#: 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 "croquet"
 
-#: 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 "ciclismo"
 
-#: 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 "carrera de perros"
 
-#: 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 "hípica"
 
-#: 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 "fútbol"
 
-#: 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 "golf"
 
-#: 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 "gimnasia"
 
-#: 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 "hockey"
 
-#: 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 "carrera de caballos"
 
-#: 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 "motor"
 
-#: 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 "pelota vasca"
 
-#: 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 "raqueta"
 
-#: 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 "rugby"
 
-#: 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 "tiro"
 
-#: 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 "monopatín"
 
-#: 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 "patinaje"
 
-#: 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 "esquí"
 
-#: 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 "Fútbol"
 
-#: 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 "natación"
 
-#: 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 "tenis de mesa"
 
-#: 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 "tenis"
 
-#: build/trans_presets.java:1793
+#: build/trans_presets.java:1794
 msgid "Sports Centre"
 msgstr "Polideportivo"
 
 #. item
-#: build/trans_presets.java:1794
+#: build/trans_presets.java:1795
 msgid "Edit Sports Centre"
 msgstr "Editar polideportivo"
 
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1803
 msgid "Pitch"
 msgstr "Campo de juego"
 
 #. item
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1804
 msgid "Edit Pitch"
 msgstr "Editar campo de juego"
 
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1812
 msgid "Racetrack"
 msgstr "Pista de carreras"
 
 #. item
-#: build/trans_presets.java:1812
+#: build/trans_presets.java:1813
 msgid "Edit Racetrack"
 msgstr "Editar pista de carreras"
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1821
 msgid "Golf Course"
 msgstr "Campo de golf"
 
 #. item
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1822
 msgid "Edit Golf Course"
 msgstr "Editar campo de golf"
 
 #. item "Sport Facilities/Golf Course" text "Name"
-#: build/trans_presets.java:1825
+#: build/trans_presets.java:1826
 msgid "Miniature Golf"
 msgstr "Mini golf"
 
 #. item
-#: build/trans_presets.java:1826
+#: build/trans_presets.java:1827
 msgid "Edit Miniature Golf"
 msgstr "Editar mini golf"
 
 #. item "Sport Facilities/Miniature Golf" text "Name"
-#: build/trans_presets.java:1831
+#: build/trans_presets.java:1832
 msgid "Sport"
 msgstr "Deporte"
 
 #. group "Sport"
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1833
 msgid "Multi"
 msgstr "Multi"
 
 #. item
-#: build/trans_presets.java:1833
+#: build/trans_presets.java:1834
 msgid "Edit Multi"
 msgstr "Editar multi"
@@ -15417,191 +15741,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 "campo de juego"
 
-#: 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 "Polideportivo"
 
-#: 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 "Estadio"
 
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1839
 msgid "10pin"
 msgstr "Bowling"
 
 #. item
-#: build/trans_presets.java:1839
+#: build/trans_presets.java:1840
 msgid "Edit 10pin"
 msgstr "Editar bowling"
 
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1845
 msgid "Athletics"
 msgstr "Atletismo"
 
 #. item
-#: build/trans_presets.java:1845
+#: build/trans_presets.java:1846
 msgid "Edit Athletics"
 msgstr "Editar atletismo"
 
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1851
 msgid "Archery"
 msgstr "Tiro con arco"
 
 #. item
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:1852
 msgid "Edit Archery"
 msgstr "Editar tiro con arco"
 
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:1857
 msgid "Climbing"
 msgstr "Alpinismo"
 
 #. item
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:1858
 msgid "Edit Climbing"
 msgstr "Editar alpinismo"
 
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1863
 msgid "Canoeing"
 msgstr "Piragüismo"
 
 #. item
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:1864
 msgid "Edit Canoeing"
 msgstr "Editar piragüismo"
 
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:1869
 msgid "Cycling"
 msgstr "Ciclismo"
 
 #. item
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1870
 msgid "Edit Cycling"
 msgstr "Editar ciclismo"
 
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1875
 msgid "Dog Racing"
 msgstr "Carreras de perros"
 
 #. item
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1876
 msgid "Edit Dog Racing"
 msgstr "Editar carreras de perros"
 
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1881
 msgid "Equestrian"
 msgstr "Hípica"
 
 #. item
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:1882
 msgid "Edit Equestrian"
 msgstr "Editar hípica"
 
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1887
 msgid "Horse Racing"
 msgstr "Carreras de caballos"
 
 #. item
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1888
 msgid "Edit Horse Racing"
 msgstr "Editar carreras de caballos"
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:1893
 msgid "Gymnastics"
 msgstr "Gimnasia"
 
 #. item
-#: build/trans_presets.java:1893
+#: build/trans_presets.java:1894
 msgid "Edit Gymnastics"
 msgstr "Editar gimnasia"
 
-#: build/trans_presets.java:1898
+#: build/trans_presets.java:1899
 msgid "Motor Sports"
 msgstr "Deportes de motor"
 
 #. item
-#: build/trans_presets.java:1899
+#: build/trans_presets.java:1900
 msgid "Edit Motor Sports"
 msgstr "Editar deportes de motor"
 
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:1905
 msgid "Skating"
 msgstr "Patinaje"
 
 #. item
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:1906
 msgid "Edit Skating"
 msgstr "Editar patinaje"
 
-#: build/trans_presets.java:1910
+#: build/trans_presets.java:1911
 msgid "Skateboard"
 msgstr "Monopatín"
 
 #. item
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:1912
 msgid "Edit Skateboard"
 msgstr "Editar monopatín"
 
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:1917
 msgid "Swimming"
 msgstr "Natación"
 
 #. item
-#: build/trans_presets.java:1917
+#: build/trans_presets.java:1918
 msgid "Edit Swimming"
 msgstr "Editar natación"
 
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:1923
 msgid "Skiing"
 msgstr "Esquí"
@@ -15609,56 +15933,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 "Editar esquí"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1928
 msgid "Piste type"
 msgstr "Tipo de pista de esquí"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1928
 msgid "downhill"
 msgstr "de descenso"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1928
 msgid "nordic"
 msgstr "nórdico"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1928
 msgid "snow_park"
 msgstr "parque de snowboard"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:1929
 msgid "Difficulty"
 msgstr "Dificultad"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:1929
 msgid "novice"
 msgstr "novato"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:1929
 msgid "easy"
 msgstr "fácil"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:1929
 msgid "intermediate"
 msgstr "intermedio"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:1929
 msgid "advanced"
 msgstr "avanzado"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:1929
 msgid "expert"
 msgstr "experto"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:1929
 msgid "freeride"
 msgstr "fuera de pista"
 
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1932
 msgid "Shooting"
 msgstr "Tiro"
@@ -15666,178 +15990,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 "Editar tiro"
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1940
 msgid "Sport (Ball)"
 msgstr "Deporte (Pelota)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1941
 msgid "Soccer"
 msgstr "Fútbol"
 
 #. item
-#: build/trans_presets.java:1941
+#: build/trans_presets.java:1942
 msgid "Edit Soccer"
 msgstr "Editar fútbol"
 
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:1947
 msgid "Football"
 msgstr "Fútbol americano"
 
 #. item
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:1948
 msgid "Edit Football"
 msgstr "Editar fútbol americano"
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1953
 msgid "Australian Football"
 msgstr "Fútbol australiano"
 
 #. item
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:1954
 msgid "Edit Australian Football"
 msgstr "Editar fútbol australiano"
 
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:1959
 msgid "Baseball"
 msgstr "Béisbol"
 
 #. item
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:1960
 msgid "Edit Baseball"
 msgstr "Editar béisbol"
 
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:1965
 msgid "Basketball"
 msgstr "Baloncesto"
 
 #. item
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:1966
 msgid "Edit Basketball"
 msgstr "Editar baloncesto"
 
-#: 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 "Editar golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1975
 msgid "golf_course"
 msgstr "campo de golf"
 
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:1977
 msgid "Boule"
 msgstr "Boule"
 
 #. item
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:1978
 msgid "Edit Boule"
 msgstr "Editar boule"
 
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:1983
 msgid "Bowls"
 msgstr "Bolos"
 
 #. item
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1984
 msgid "Edit Bowls"
 msgstr "Editar bolos"
 
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:1989
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:1990
 msgid "Edit Cricket"
 msgstr "Edit cricket"
 
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:1995
 msgid "Cricket Nets"
 msgstr "Cricket con redes"
 
 #. item
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:1996
 msgid "Edit Cricket Nets"
 msgstr "Editar cricket con redes"
 
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:2001
 msgid "Croquet"
 msgstr "Croquet"
 
 #. item
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:2002
 msgid "Edit Croquet"
 msgstr "Editar croquet"
 
-#: build/trans_presets.java:2006
+#: build/trans_presets.java:2007
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item
-#: build/trans_presets.java:2007
+#: build/trans_presets.java:2008
 msgid "Edit Hockey"
 msgstr "Editar hockey"
 
-#: build/trans_presets.java:2012
+#: build/trans_presets.java:2013
 msgid "Pelota"
 msgstr "Pelota vasca"
 
 #. item
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2014
 msgid "Edit Pelota"
 msgstr "Editar pelota vasca"
 
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2019
 msgid "Racquet"
 msgstr "Raqueta"
 
 #. item
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2020
 msgid "Edit Racquet"
 msgstr "Editar raqueta"
 
-#: build/trans_presets.java:2024
+#: build/trans_presets.java:2025
 msgid "Rugby"
 msgstr "Rugby"
 
 #. item
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2026
 msgid "Edit Rugby"
 msgstr "Editar rugby"
 
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:2031
 msgid "Table Tennis"
 msgstr "Ping-pong"
 
 #. item
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2032
 msgid "Edit Table Tennis"
 msgstr "Editar ping-pong"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2037
 msgid "Tennis"
 msgstr "Tenis"
 
 #. item
-#: build/trans_presets.java:2037
+#: build/trans_presets.java:2038
 msgid "Edit Tennis"
 msgstr "Editar tenis"
 
 #. <separator/>
-#: build/trans_presets.java:2044
+#: build/trans_presets.java:2045
 msgid "Buildings"
 msgstr "Edificios"
 
 #. group "Buildings"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2046
 msgid "Building"
 msgstr "Edificio"
@@ -15845,5 +16169,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2049
 msgid "Public Building"
 msgstr "Edificio público"
@@ -15851,10 +16175,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 "Editar edificio público"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2055
 msgid "Town hall"
 msgstr "Ayuntamiento"
@@ -15862,10 +16186,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 "Editar ayuntamiento"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2061
 msgid "Embassy"
 msgstr "Embajada"
@@ -15873,10 +16197,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 "Editar embajada"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2066
+#: build/trans_presets.java:2067
 msgid "Courthouse"
 msgstr "Juzgado"
@@ -15885,10 +16209,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 "Editar juzgado"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2074
 msgid "Prison"
 msgstr "Prisión"
@@ -15897,10 +16221,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 "Editar prisión"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2080
+#: build/trans_presets.java:2081
 msgid "Police"
 msgstr "Policía"
@@ -15910,10 +16234,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 "Editar policía"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2089
 msgid "Fire Station"
 msgstr "Parque de bomberos"
@@ -15922,10 +16246,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 "Editar parque de bomberos"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2096
 msgid "Post Office"
 msgstr "Oficina postal"
@@ -15933,5 +16257,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 "Editar oficina postal"
@@ -15939,15 +16263,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2103
 msgid "Kindergarten"
 msgstr "Jardín de infancia"
 
 #. item
-#: build/trans_presets.java:2103
+#: build/trans_presets.java:2104
 msgid "Edit Kindergarten"
 msgstr "Editar jardín de infancia"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2108
 msgid "School"
 msgstr "Escuela"
@@ -15955,10 +16279,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 "Editar escuela"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2114
 msgid "University"
 msgstr "Universidad"
@@ -15966,10 +16290,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 "Editar universidad"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2120
 msgid "College"
 msgstr "Instituto de enseñanza secundaria"
@@ -15977,5 +16301,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 "Editar instituto de enseñanza secundaria"
@@ -15983,5 +16307,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2126
+#: build/trans_presets.java:2127
 msgid "Cinema"
 msgstr "Cine"
@@ -15990,10 +16314,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 "Editar cine"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2133
+#: build/trans_presets.java:2134
 msgid "Library"
 msgstr "Biblioteca"
@@ -16002,10 +16326,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 "Editar biblioteca"
 
 #. item "Buildings/Library" text "Name"
-#: build/trans_presets.java:2140
+#: build/trans_presets.java:2141
 msgid "Arts Centre"
 msgstr "Centro de arte"
@@ -16013,10 +16337,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 "Editar centro de arte"
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2146
+#: build/trans_presets.java:2147
 msgid "Theatre"
 msgstr "Teatro"
@@ -16025,10 +16349,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 "Editar teatro"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2154
 msgid "Place of Worship"
 msgstr "Lugar de culto"
@@ -16038,5 +16362,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 "Editar lugar de culto"
@@ -16045,6 +16369,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 "Religión"
@@ -16053,66 +16377,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 "bahaísta"
 
-#: 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 "budista"
 
-#: 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 "cristiana"
 
-#: 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 "hindú"
 
-#: 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 "jainista"
 
-#: 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 "judía"
 
-#: 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 "musulmana"
 
-#: 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 "sijista"
 
-#: 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 "espiritualista"
 
-#: 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 "taoista"
 
-#: 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 "unitarismo"
 
-#: 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 "zoroástrica"
 
-#: 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 "Confesión"
@@ -16121,81 +16445,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 "anglicano"
 
-#: 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 "baptista"
 
-#: 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 "católico"
 
-#: 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 "evangélico"
 
-#: 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 "testigos de Jehová"
 
-#: 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 "luterano"
 
-#: 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 "metodista"
 
-#: 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 "mormón"
 
-#: 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 "ortodoxo"
 
-#: 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 "pentecostal"
 
-#: 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 "presbiteriano"
 
-#: 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 "protestante"
 
-#: 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 "cuáquero"
 
-#: 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 "chiita"
 
-#: 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 "suní"
 
 #. <separator/>
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2165
 msgid "Addresses"
 msgstr "Direcciones"
@@ -16204,5 +16528,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 "Editar direcciones"
@@ -16210,5 +16534,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2169
+#: build/trans_presets.java:2170
 msgid "House number"
 msgstr "Número de portal"
@@ -16216,20 +16540,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2172
 msgid "House name"
 msgstr "Nombre del edificio"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2174
 msgid "City name"
 msgstr "Nombre de la ciudad"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2174
+#: build/trans_presets.java:2175
 msgid "Post code"
 msgstr "Código postal"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2176
 msgid "Country code"
 msgstr "Código del país"
@@ -16237,5 +16561,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2179
 msgid "Address Interpolation"
 msgstr "Direcciones interpoladas"
@@ -16244,5 +16568,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 "Editar direcciones interpoladas"
@@ -16250,71 +16574,71 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2184
 msgid "Numbering scheme"
 msgstr "Esquema numérico"
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2184
 msgid "odd"
 msgstr "impares"
 
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2184
 msgid "even"
 msgstr "pares"
 
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2184
 msgid "all"
 msgstr "todos"
 
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2184
 msgid "alphabetic"
 msgstr "alfabético"
 
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2187
 msgid "Man Made"
 msgstr "Construcciones"
 
 #. group "Man Made"
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2188
 msgid "Works"
 msgstr "Fábrica"
 
 #. item
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2189
 msgid "Edit Works"
 msgstr "Editar fábrica"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2193
 msgid "Tower"
 msgstr "Torre"
 
 #. item
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2194
 msgid "Edit Tower"
 msgstr "Editar torre"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2198
 msgid "Water Tower"
 msgstr "Torre de agua"
 
 #. item
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2199
 msgid "Edit Water Tower"
 msgstr "Editar torre de agua"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2203
 msgid "Gasometer"
 msgstr "Gasómetro"
 
 #. item
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2204
 msgid "Edit Gasometer"
 msgstr "Editar gasómetro"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2207
+#: build/trans_presets.java:2208
 msgid "Lighthouse"
 msgstr "Faro"
@@ -16322,10 +16646,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 "Editar faro"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2214
 msgid "Windmill"
 msgstr "Molino de viento"
@@ -16333,10 +16657,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 "Editar molino de viento"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2220
 msgid "Pipeline"
 msgstr "Tubería"
@@ -16344,10 +16668,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 "Editar tubería"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2225
+#: build/trans_presets.java:2226
 msgid "Wastewater Plant"
 msgstr "Depuradora"
@@ -16357,10 +16681,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 "Editar depuradora"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2233
+#: build/trans_presets.java:2234
 msgid "Crane"
 msgstr "Grúa"
@@ -16368,10 +16692,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 "Editar grúa"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2239
+#: build/trans_presets.java:2240
 msgid "Beacon"
 msgstr "Baliza"
@@ -16379,10 +16703,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 "Editar baliza"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2245
+#: build/trans_presets.java:2246
 msgid "Survey Point"
 msgstr "Vértice geodésico"
@@ -16390,10 +16714,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 "Editar vértice geodésico"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2252
 msgid "Surveillance"
 msgstr "Cámara de vigilacia"
@@ -16401,5 +16725,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 "Editar cámara de vigilancia"
@@ -16407,5 +16731,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2258
+#: build/trans_presets.java:2259
 msgid "Power Generator"
 msgstr "Generador de energía"
@@ -16415,39 +16739,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 "Editar generador de energía"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "wind"
 msgstr "eólico"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "hydro"
 msgstr "hidráulico"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "fossil"
 msgstr "fósil"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "nuclear"
 msgstr "nuclear"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "coal"
 msgstr "carbón"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "photovoltaic"
 msgstr "fotovoltaico"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "gas"
 msgstr "gas"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2268
 msgid "Power Station"
 msgstr "Central eléctrica"
@@ -16456,10 +16780,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 "Editar central eléctrica"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2274
+#: build/trans_presets.java:2275
 msgid "Power Sub Station"
 msgstr "Subestación eléctrica"
@@ -16468,5 +16792,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 "Editar subestación eléctrica"
@@ -16474,10 +16798,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 "Línea de referencia"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2282
+#: build/trans_presets.java:2283
 msgid "Power Tower"
 msgstr "Torre de electricidad"
@@ -16488,5 +16812,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 "Editar torre de electricidad"
@@ -16494,5 +16818,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 "Tendido eléctrico"
@@ -16501,25 +16825,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 "Editar tendido eléctrico"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2298
 msgid "Voltage"
 msgstr "Voltaje"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2299
 msgid "Amount of Wires"
 msgstr "Número de cables"
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2301
+#: build/trans_presets.java:2302
 msgid "Amenities"
 msgstr "Servicios"
 
 #. group "Amenities"
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2303
 msgid "Toilets"
 msgstr "Baños"
@@ -16527,20 +16851,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 "Número de referencia"
 
 #. 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 "Nota"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2312
 msgid "Post Box"
 msgstr "Buzón de correos"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2317
 msgid "Telephone"
 msgstr "Teléfono"
@@ -16549,5 +16873,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 "Editar teléfono"
@@ -16555,5 +16879,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 "Monedas"
@@ -16561,5 +16885,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 "Billetes"
@@ -16567,5 +16891,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 "Tarjetas de recarga y monederos electrónicos"
@@ -16573,5 +16897,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 "Tarjetas de débito"
@@ -16579,15 +16903,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 "Tarjetas de crédito"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2328
 msgid "Telephone cards"
 msgstr "Tarjetas telefónicas"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2330
 msgid "Recycling"
 msgstr "Reciclaje"
@@ -16596,5 +16920,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 "Editar punto limpio"
@@ -16602,35 +16926,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 "Baterías"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2336
 msgid "Cans"
 msgstr "Envases"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2337
 msgid "Clothes"
 msgstr "Ropas"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2338
 msgid "Glass"
 msgstr "Vidrio"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2339
 msgid "Paper"
 msgstr "Papel"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2340
 msgid "Scrap Metal"
 msgstr "Chatarra"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2342
 msgid "Bench"
 msgstr "Banco"
@@ -16639,20 +16963,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 "Apostadero de caza"
 
 #. item
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2347
 msgid "Edit Hunting Stand"
 msgstr "Editar apostadero de caza"
 
 #. item "Amenities/Hunting Stand" check "Shelter"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2350
 msgid "Hide"
 msgstr "Oculto"
 
 #. item "Amenities/Hunting Stand" check "Hide"
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2351
 msgid "Lock"
 msgstr "Esclusa"
@@ -16660,22 +16984,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 "Altura"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2351
+#: build/trans_presets.java:2352
 msgid "low"
 msgstr "profundidad"
 
-#: build/trans_presets.java:2351
+#: build/trans_presets.java:2352
 msgid "half"
 msgstr "media"
 
-#: build/trans_presets.java:2351
+#: build/trans_presets.java:2352
 msgid "full"
 msgstr "total"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2354
 msgid "Fountain"
 msgstr "Fuente"
@@ -16684,10 +17008,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 "Editar fuente"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2361
 msgid "Drinking Water"
 msgstr "Agua potable"
@@ -16696,10 +17020,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 "Editar agua potable"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2367
+#: build/trans_presets.java:2368
 msgid "Baby Hatch"
 msgstr "Caja tibia"
@@ -16707,25 +17031,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 "Editar caja tibia"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2375
+#: build/trans_presets.java:2376
 msgid "Shops"
 msgstr "Tiendas"
 
 #. group "Shops"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2377
 msgid "Supermarket"
 msgstr "Supermercado"
 
 #. item
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2378
 msgid "Edit Supermarket"
 msgstr "Editar supermercado"
 
 #. item "Shops/Supermarket" text "Name"
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:2382
 msgid "Convenience Store"
 msgstr "Tienda de alimentación"
@@ -16733,10 +17057,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 "Editar tienda de alimentación"
 
 #. item "Shops/Convenience Store" text "Name"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2388
 msgid "Kiosk"
 msgstr "Kiosko"
@@ -16744,10 +17068,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 "Editar kiosko"
 
 #. item "Shops/Kiosk" text "Name"
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2394
 msgid "Vending machine"
 msgstr "Máquina expendedora"
@@ -16755,5 +17079,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 "Editar máquina expendedora"
@@ -16761,88 +17085,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 "Expendedor automático de productos"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "public_transport_tickets"
 msgstr "billetes de de transporte público"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "public_transport_plans"
 msgstr "abonos de transporte público"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "parking_tickets"
 msgstr "billetes de aparcamiento"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "food"
 msgstr "Alimentación"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "drinks"
 msgstr "Bebidas"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "sweets"
 msgstr "Caramelos"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "cigarettes"
 msgstr "Estanco"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "photos"
 msgstr "fotos"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "animal_food"
 msgstr "comida para animales"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "news_papers"
 msgstr "Periódicos"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "toys"
 msgstr "juguetes"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "stamps"
 msgstr "sellos"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "SIM-cards"
 msgstr "Tarjetas SIM"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "telephone_vouchers"
 msgstr "Tarjetas telefónicas"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "vouchers"
 msgstr "Bonos"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "condoms"
 msgstr "condones"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "tampons"
 msgstr "tampones"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "excrement_bags"
 msgstr "Bolsas para excrementos"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2407
 msgid "Account or loyalty cards"
 msgstr "Tarjetas de fidelización o descuento"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2408
+#: build/trans_presets.java:2409
 msgid "Butcher"
 msgstr "Carnicería"
@@ -16850,10 +17174,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 "Editar carnicería"
 
 #. item "Shops/Butcher" text "Name"
-#: build/trans_presets.java:2414
+#: build/trans_presets.java:2415
 msgid "Baker"
 msgstr "Panadería"
@@ -16861,10 +17185,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 "Editar panadería"
 
 #. item "Shops/Baker" text "Name"
-#: build/trans_presets.java:2420
+#: build/trans_presets.java:2421
 msgid "Florist"
 msgstr "Floristería"
@@ -16872,20 +17196,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 "Editar floristería"
 
 #. item "Shops/Florist" text "Name"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2427
 msgid "Organic"
 msgstr "Tienda de productos orgánicos"
 
 #. item
-#: build/trans_presets.java:2427
+#: build/trans_presets.java:2428
 msgid "Edit Organic Shop"
 msgstr "Editar tienda de productos orgánicos"
 
 #. item "Shops/Organic" text "Name"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2432
 msgid "Alcohol"
 msgstr "Tienda de bebidas alcohólicas"
@@ -16893,60 +17217,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 "Editar tienda de bebidas alcohólicas"
 
 #. item "Shops/Alcohol" text "Name"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2438
 msgid "Beverages"
 msgstr "Bebidas"
 
 #. item
-#: build/trans_presets.java:2438
+#: build/trans_presets.java:2439
 msgid "Edit Beverages Shop"
 msgstr "Editar tienda de bebidas"
 
 #. item "Shops/Beverages" text "Name"
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:2443
 msgid "Computer"
 msgstr "Computador"
 
 #. item
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2444
 msgid "Edit Computer Shop"
 msgstr "Editar tienda de computadores"
 
 #. item "Shops/Computer" text "Name"
-#: build/trans_presets.java:2447
+#: build/trans_presets.java:2448
 msgid "Electronics"
 msgstr "Electrónica"
 
 #. item
-#: build/trans_presets.java:2448
+#: build/trans_presets.java:2449
 msgid "Edit Electronics Shop"
 msgstr "Editar tienda de electrónica"
 
 #. item "Shops/Electronics" text "Name"
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2453
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2454
 msgid "Edit Hifi Shop"
 msgstr "Editar Tienda Hifi"
 
 #. item "Shops/Hifi" text "Name"
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2458
 msgid "Furniture"
 msgstr "Muebles"
 
 #. item
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2459
 msgid "Edit Furniture Shop"
 msgstr "Editar mueblería"
 
 #. item "Shops/Furniture" text "Name"
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2463
 msgid "Garden Centre"
 msgstr "Centro de jardinería"
@@ -16954,10 +17278,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 "Editar centro de jardinería"
 
 #. item "Shops/Garden Centre" text "Name"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2469
 msgid "Hardware"
 msgstr "Hardware"
@@ -16965,10 +17289,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 "Editar almacén de hardware"
 
 #. item "Shops/Hardware" text "Name"
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2475
 msgid "Do-it-yourself-store"
 msgstr "Almacén de bricolaje"
@@ -16976,60 +17300,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 "Editar almacén de bricolaje"
 
 #. item "Shops/Do-it-yourself-store" text "Name"
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2481
 msgid "Stationery"
 msgstr "Papelería"
 
 #. item
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2482
 msgid "Edit Stationery Shop"
 msgstr "Editar papelería"
 
 #. item "Shops/Stationery" text "Name"
-#: build/trans_presets.java:2485
+#: build/trans_presets.java:2486
 msgid "Hairdresser"
 msgstr "Peluquería"
 
 #. item
-#: build/trans_presets.java:2486
+#: build/trans_presets.java:2487
 msgid "Edit Hairdresser"
 msgstr "Editar peluquería"
 
 #. item "Shops/Hairdresser" text "Name"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2491
 msgid "Shoes"
 msgstr "Zapatos"
 
 #. item
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2492
 msgid "Edit Shoe Shop"
 msgstr "Editar zapatería"
 
 #. item "Shops/Shoes" text "Name"
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2496
 msgid "Toys"
 msgstr "Juguetes"
 
 #. item
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2497
 msgid "Edit Toy Shop"
 msgstr "Editar juguetería"
 
 #. 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 "Editar tienda de videos"
 
 #. item "Shops/Video" text "Name"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2506
 msgid "Dry Cleaning"
 msgstr "Tintorería"
@@ -17037,10 +17361,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 "Editar tintorería"
 
 #. item "Shops/Dry Cleaning" text "Name"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2512
 msgid "Laundry"
 msgstr "Lavandería"
@@ -17048,10 +17372,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 "Editar lavandería"
 
 #. item "Shops/Laundry" text "Name"
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2518
 msgid "Outdoor"
 msgstr "Tienda de actividades al aire libre"
@@ -17059,35 +17383,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 "Editar tienda de actividades al aire libre"
 
 #. item "Shops/Outdoor" text "Name"
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2524
 msgid "Sports"
 msgstr "Deportes"
 
 #. item
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2525
 msgid "Edit Sports Shop"
 msgstr "Editar tienda de material de deportes"
 
 #. item "Shops/Sports" text "Name"
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2529
 msgid "Optician"
 msgstr "Óptica"
 
 #. item
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2530
 msgid "Edit Optician"
 msgstr "Editar óptica"
 
 #. item "Shops/Optician" text "Name"
-#: build/trans_presets.java:2535
+#: build/trans_presets.java:2536
 msgid "Cash"
 msgstr "Dinero en efectivo"
 
 #. group "Cash"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2537
 msgid "Bank"
 msgstr "Banco"
@@ -17095,5 +17419,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 "Editar banco"
@@ -17101,10 +17425,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 "Cajero automático"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2544
 msgid "Money Exchange"
 msgstr "Cambio de moneda"
@@ -17112,5 +17436,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 "Editar cambio de moneda"
@@ -17118,15 +17442,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 "Editar cajero automático"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2557
 msgid "Health"
 msgstr "Centro médico"
 
 #. group "Health"
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2558
 msgid "Doctors"
 msgstr "Médico"
@@ -17134,20 +17458,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 "Editar médico"
 
 #. item "Health/Doctors" text "Name"
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2564
 msgid "Dentist"
 msgstr "Dentista"
 
 #. item
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2565
 msgid "Edit Dentist"
 msgstr "Editar dentista"
 
 #. item "Health/Dentist" text "Name"
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2569
 msgid "Pharmacy"
 msgstr "Farmacia/Parafarmacia"
@@ -17155,5 +17479,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 "Editar farmacia/parafarmacia"
@@ -17161,10 +17485,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 "Expende con receta médica"
 
 #. item "Health/Pharmacy" text "Name"
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2576
 msgid "Hospital"
 msgstr "Hospital"
@@ -17172,10 +17496,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 "Editar hospital"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2582
 msgid "Emergency Access Point"
 msgstr "Punto de acceso para emergencias"
@@ -17184,5 +17508,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 "Editar punto de acceso para emergencias"
@@ -17191,20 +17515,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2588
 msgid "Point Number"
 msgstr "Número de punto"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2589
 msgid "Point Name"
 msgstr "Nombre del Punto"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2591
 msgid "Phone Number"
 msgstr "Número de teléfono"
 
 #. 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 "(Utilizar código internacional, como +12-345-67890)"
@@ -17212,5 +17536,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 "Veterinario"
@@ -17219,25 +17543,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 "Editar veterinario"
 
 #. group "Places"
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2605
 msgid "Continent"
 msgstr "Continente"
 
 #. item
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2606
 msgid "Edit Continent"
 msgstr "Editar continente"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2611
 msgid "Country"
 msgstr "País"
 
 #. item
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2612
 msgid "Edit Country"
 msgstr "Editar país"
@@ -17245,30 +17569,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 "Estado/Provincia"
 
 #. item
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2618
 msgid "Edit State"
 msgstr "Editar estado/provincia"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2622
+#: build/trans_presets.java:2623
 msgid "Region"
 msgstr "Región"
 
 #. item
-#: build/trans_presets.java:2623
+#: build/trans_presets.java:2624
 msgid "Edit Region"
 msgstr "Editar región"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2628
+#: build/trans_presets.java:2629
 msgid "County"
 msgstr "Municipio"
 
 #. item
-#: build/trans_presets.java:2629
+#: build/trans_presets.java:2630
 msgid "Edit County"
 msgstr "Editar municipio"
@@ -17276,15 +17600,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2635
+#: build/trans_presets.java:2636
 msgid "City"
 msgstr "Ciudad (>100.000 hab.)"
 
 #. item
-#: build/trans_presets.java:2636
+#: build/trans_presets.java:2637
 msgid "Edit City"
 msgstr "Editar ciudad (>100.00 hab.)"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2641
+#: build/trans_presets.java:2642
 msgid "Town"
 msgstr "Ciudad (10.000 - 100.000 hab.)"
@@ -17292,10 +17616,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 "Editar ciudad (10.000 - 100.000 hab.)"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2649
 msgid "Suburb"
 msgstr ""
@@ -17305,5 +17629,5 @@
 #. 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 ""
@@ -17312,15 +17636,15 @@
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2656
 msgid "Village"
 msgstr "Población (< 10.000 hab.)"
 
 #. item
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2657
 msgid "Edit Village"
 msgstr "Editar población (< 10.000 hab.)"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2662
 msgid "Hamlet"
 msgstr ""
@@ -17328,5 +17652,5 @@
 
 #. item
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2663
 msgid "Edit Hamlet"
 msgstr ""
@@ -17336,5 +17660,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2669
 msgid "Locality"
 msgstr "Paraje"
@@ -17342,10 +17666,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 "Editar paraje"
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2676
 msgid "Island"
 msgstr "Isla"
@@ -17353,5 +17677,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 "Editar isla"
@@ -17359,5 +17683,5 @@
 #. item "Places/Island" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2683
+#: build/trans_presets.java:2684
 msgid "Cave Entrance"
 msgstr "Entrada de cueva"
@@ -17365,10 +17689,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 "Editar entrada de cueva"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2690
 msgid "Peak"
 msgstr "Pico"
@@ -17376,10 +17700,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 "Editar pico"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2697
 msgid "Glacier"
 msgstr "Glaciar"
@@ -17387,10 +17711,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 "Editar glaciar"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2703
+#: build/trans_presets.java:2704
 msgid "Volcano"
 msgstr "Volcán"
@@ -17398,70 +17722,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 "Editar volcán"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2711
+#: build/trans_presets.java:2712
 msgid "Boundaries"
 msgstr "Fronteras"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2713
 msgid "National"
 msgstr "Nacional"
 
 #. item
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2714
 msgid "Edit National Boundary"
 msgstr "Editar frontera nacional"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2718
+#: build/trans_presets.java:2719
 msgid "Administrative"
 msgstr "Administrativa"
 
 #. item
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2720
 msgid "Edit Administrative Boundary"
 msgstr "Editar frontera administrativa"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2724
+#: build/trans_presets.java:2725
 msgid "Civil"
 msgstr "Civil"
 
 #. item
-#: build/trans_presets.java:2725
+#: build/trans_presets.java:2726
 msgid "Edit Civil Boundary"
 msgstr "Editar frontera civil"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2730
+#: build/trans_presets.java:2731
 msgid "Political"
 msgstr "Político"
 
 #. item
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:2732
 msgid "Edit Political Boundary"
 msgstr "Editar frontera política"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2736
+#: build/trans_presets.java:2737
 msgid "National park"
 msgstr "Parque Nacional"
 
 #. item
-#: build/trans_presets.java:2737
+#: build/trans_presets.java:2738
 msgid "Edit National Park Boundary"
 msgstr "Editar límites del parque nacional"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2744
 msgid "Land use"
 msgstr "Uso del suelo"
 
 #. group "Land use"
-#: build/trans_presets.java:2744
+#: build/trans_presets.java:2745
 msgid "Tree"
 msgstr "Árbol"
@@ -17470,15 +17794,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 "Editar árbol"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2753
 msgid "Botanical Name"
 msgstr "Nombre botánico"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2755
 msgid "Wood"
 msgstr "Bosque"
@@ -17487,5 +17811,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 "Editar bosque"
@@ -17493,17 +17817,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 "conífera"
 
-#: build/trans_presets.java:2760 build/trans_presets.java:2769
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
 msgid "deciduous"
 msgstr "caducifolio"
 
-#: build/trans_presets.java:2760 build/trans_presets.java:2769
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
 msgid "mixed"
 msgstr "mixto"
 
-#: build/trans_presets.java:2762
+#: build/trans_presets.java:2763
 msgid "Forest"
 msgstr "Plantación forestal"
@@ -17512,14 +17836,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 "Editar zona forestal"
 
-#: build/trans_presets.java:2771
+#: build/trans_presets.java:2772
 msgid "Nature Reserve"
 msgstr "Reserva natural"
 
 #. item
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2773
 msgid "Edit Nature Reserve"
 msgstr "Editar reserva natural"
@@ -17527,25 +17851,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2777
+#: build/trans_presets.java:2778
 msgid "Scree"
 msgstr "Pedregal"
 
 #. item
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:2779
 msgid "Edit Scree"
 msgstr "Editar pedregal"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2783
 msgid "Scrub"
 msgstr "Matorral"
 
 #. item
-#: build/trans_presets.java:2783
+#: build/trans_presets.java:2784
 msgid "Edit Scrub"
 msgstr "Editar matorral"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2788
 msgid "Fell"
 msgstr "Braña"
@@ -17553,10 +17877,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 "Editar braña"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2794
 msgid "Heath"
 msgstr "Brezal o landa"
@@ -17564,5 +17888,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 "Editar brezal o landa"
@@ -17570,5 +17894,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2801
 msgid "Farmyard"
 msgstr "Edificio agrario"
@@ -17577,45 +17901,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 "Editar edificio agrario"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2808
+#: build/trans_presets.java:2809
 msgid "Farmland"
 msgstr "Tierra de labranza"
 
 #. item
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2810
 msgid "Edit Farmland Landuse"
 msgstr "Editar tierra de labranza"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2814
+#: build/trans_presets.java:2815
 msgid "Meadow"
 msgstr "Prado"
 
 #. item
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2816
 msgid "Edit Meadow Landuse"
 msgstr "Editar prado"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2820
+#: build/trans_presets.java:2821
 msgid "Vineyard"
 msgstr "Viñedo"
 
 #. item
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2822
 msgid "Edit Vineyard Landuse"
 msgstr "Editar viñedo"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2826
+#: build/trans_presets.java:2827
 msgid "Allotments"
 msgstr "Huertos de ocio"
 
 #. item
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:2828
 msgid "Edit Allotments Landuse"
 msgstr "Editar zona de huertos de ocio"
@@ -17623,25 +17947,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2833
+#: build/trans_presets.java:2834
 msgid "Garden"
 msgstr "Jardín"
 
 #. item
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2835
 msgid "Edit Garden"
 msgstr "Editar jardín"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2838
+#: build/trans_presets.java:2839
 msgid "Grass"
 msgstr "Pastizal"
 
 #. item
-#: build/trans_presets.java:2839
+#: build/trans_presets.java:2840
 msgid "Edit Grass Landuse"
 msgstr "Editar pastizal"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2845
 msgid "Village Green"
 msgstr "Parque municipal"
@@ -17649,10 +17973,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 "Editar parque municipal"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:2852
 msgid "Common"
 msgstr "Espacio de uso común (plazas, alamedas, bulevares, etc.)"
@@ -17660,20 +17984,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 "Editar espacio de uso común"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2858
 msgid "Park"
 msgstr "Parque"
 
 #. item
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:2859
 msgid "Edit Park"
 msgstr "Editar parque"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2863
 msgid "Recreation Ground"
 msgstr "Área de esparcimiento"
@@ -17681,5 +18005,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 "Editar área de esparcimiento"
@@ -17687,15 +18011,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2871
 msgid "Residential area"
 msgstr "Área residencial"
 
 #. item
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2872
 msgid "Edit Residential Landuse"
 msgstr "Editar suelo residencial"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2877
 msgid "Graveyard"
 msgstr "Cementario"
@@ -17703,9 +18027,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 "Editar cementerio"
 
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:2885
 msgid "Cemetery"
 msgstr "Cementerio"
@@ -17713,39 +18037,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 "Editar cementerio"
 
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2894
 msgid "Retail"
 msgstr "Comercios"
 
 #. item
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2895
 msgid "Edit Retail Landuse"
 msgstr "Editar comercios"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2900
 msgid "Commercial"
 msgstr "Oficinas"
 
 #. item
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2901
 msgid "Edit Commercial Landuse"
 msgstr "Editar oficinas"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2906
 msgid "Industrial"
 msgstr "Industrial"
 
 #. item
-#: build/trans_presets.java:2906
+#: build/trans_presets.java:2907
 msgid "Edit Industrial Landuse"
 msgstr "Editar suelo industrial"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2912
 msgid "Railway land"
 msgstr "Zona ferroviaria"
@@ -17753,15 +18077,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 "Editar zona ferroviaria"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:2919
 msgid "Military"
 msgstr "Militar"
 
 #. item
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2920
 msgid "Edit Military Landuse"
 msgstr "Editar área militar"
@@ -17769,55 +18093,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2925
+#: build/trans_presets.java:2926
 msgid "Construction area"
 msgstr "Zona en construcción"
 
 #. item
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2927
 msgid "Edit Construction Landuse"
 msgstr "Editar zona en construcción"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2932
 msgid "Brownfield"
 msgstr "Baldío"
 
 #. item
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:2933
 msgid "Edit Brownfield Landuse"
 msgstr "Editar terreno baldío"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2937
+#: build/trans_presets.java:2938
 msgid "Greenfield"
 msgstr "Suelo en construcción"
 
 #. item
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:2939
 msgid "Edit Greenfield Landuse"
 msgstr "Editar suelo en contrucción"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:2944
 msgid "Landfill"
 msgstr "Vertedero"
 
 #. item
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:2945
 msgid "Edit Landfill Landuse"
 msgstr "Editar vertedero"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2950
 msgid "Quarry"
 msgstr "Cantera"
 
 #. item
-#: build/trans_presets.java:2950
+#: build/trans_presets.java:2951
 msgid "Edit Quarry Landuse"
 msgstr "Editar cantera"
 
 #. group "Relations"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2960
 msgid "Multipolygon"
 msgstr "Multipolígono"
@@ -17827,5 +18151,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 "Editar multipolígono"
@@ -17834,10 +18158,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:2970
 msgid "outer segment"
 msgstr "segmento exterior"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:2970
+#: build/trans_presets.java:2971
 msgid "inner segment"
 msgstr "segmento interior"
@@ -17845,5 +18169,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:2974
 msgid "Turn restriction"
 msgstr "Restricción de giro"
@@ -17852,5 +18176,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 "Editar restricción de giro"
@@ -17858,34 +18182,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 "Restricción"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_left_turn"
 msgstr "prohibido girar a la izquierda"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_right_turn"
 msgstr "prohibido girar a la derecha"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_straight_on"
 msgstr "prohibido continuar recto"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_u_turn"
 msgstr "prohibido giro en U"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "only_right_turn"
 msgstr "solo giro a la derecha"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "only_left_turn"
 msgstr "solo giro a la izquierda"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "only_straight_on"
 msgstr "solo recto"
@@ -17894,15 +18218,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2983
+#: build/trans_presets.java:2984
 msgid "from way"
 msgstr "desde la vía"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2985
 msgid "via node or way"
 msgstr "a través de nodo o vía"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2986
 msgid "to way"
 msgstr "a la vía"
@@ -17910,5 +18234,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:2988
+#: build/trans_presets.java:2989
 msgid "Route"
 msgstr "Ruta"
@@ -17917,5 +18241,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 "Editar ruta"
@@ -17923,5 +18247,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 "Tipo de ruta"
@@ -17993,5 +18317,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
@@ -18000,17 +18324,17 @@
 msgstr "bicicleta"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "bus"
 msgstr "bus"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "road"
 msgstr "carretera"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "ferry"
 msgstr "ferry"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "ski"
 msgstr "ski"
@@ -18063,5 +18387,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
@@ -18070,13 +18394,13 @@
 msgstr "pie"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "hiking"
 msgstr "senderismo"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "tram"
 msgstr "tranvía"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "detour"
 msgstr "desvío"
@@ -18090,10 +18414,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 "metro"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:2997
 msgid "Symbol description"
 msgstr "Descripción del símbolo"
@@ -18101,26 +18425,26 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:2999
+#: build/trans_presets.java:3000
 msgid "Network"
 msgstr "Red"
 
 #. item "Relations/Route" combo "State"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "proposed"
 msgstr "Propuesto"
 
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "alternate"
 msgstr "Suplente"
 
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "temporary"
 msgstr "temporal"
 
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "connection"
 msgstr "Conexión"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3003
 msgid "Color (hex)"
 msgstr "Color (hex)"
@@ -18129,30 +18453,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:3006
 msgid "route segment"
 msgstr "segmento de la ruta"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3007
 msgid "forward segment"
 msgstr "segmento siguiente"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3008
 msgid "backward segment"
 msgstr "segmento anterior"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3009
 msgid "halt point"
 msgstr "punto de detención"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3010
 msgid "forward halt point"
 msgstr "próximo punto de parada"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3011
 msgid "backward halt point"
 msgstr "anterior punto de parada"
@@ -22267,7 +22591,21 @@
 msgstr "Terraserver Urban"
 
+#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
+#~ msgstr ""
+#~ "Puede usar el ratón o las teclas Ctrl+Flecha para hacer zoom y "
+#~ "desplazamiento"
+
 #~ msgid "Uploading data"
 #~ msgstr "Subiendo datos"
 
+#~ msgid "Email"
+#~ msgstr "Correo Electrónico"
+
+#~ msgid "Login name (email) to the OSM account."
+#~ msgstr "Validar nombre (correo-e) de la cuenta OSM"
+
+#~ msgid "OSM username (email)"
+#~ msgstr "Nombre de usuario OSM (correo electrónico)"
+
 #~ msgid "Unknown host"
 #~ msgstr "Host desconocido"
@@ -22275,4 +22613,11 @@
 #~ msgid "Add either site-josm.xml or Wiki Pages."
 #~ msgstr "Añadir site-josm.xml o bien Páginas Wiki"
+
+#~ msgid ""
+#~ "Server returned internal error. Try a reduced area or retry after waiting "
+#~ "some time."
+#~ msgstr ""
+#~ "El servidor devolvió un error interno. Reduzca el área o reinténtelo más "
+#~ "tarde."
 
 #~ msgid "Commit comment"
@@ -22334,6 +22679,69 @@
 #~ msgstr "¿Está seguro que quiere marcar esta cuestión como \"hecha\"?"
 
+#~ 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 URL.<br><b>Do not use a valuable Password.</b></html>"
+#~ msgstr ""
+#~ "<html>ATENCIÓN: La contraseña está almacenada en texto plano en el "
+#~ "archivo de preferencias.<br>La clave será transferida en texto plano al "
+#~ "servidor, codificada en la URL.<br><b>No usar una contraseña importante.</"
+#~ "b></html>"
+
 #~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS"
 #~ msgstr "Descargar imagen rectificada desde Metacarta's Map Rectifier WMS"
+
+#~ msgid ""
+#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab "
+#~ "- these will then show up in the WMS menu.\n"
+#~ "\n"
+#~ "You can also do this manually in the Advanced Preferences, using the "
+#~ "following schema:\n"
+#~ "wmsplugin.url.1.name=Landsat\n"
+#~ "wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n"
+#~ "wmsplugin.url.2.name=NPE Maps... etc\n"
+#~ "\n"
+#~ "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"
+#~ "\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"
+#~ "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"
+#~ "Note: Make sure the image is suitable, copyright-wise, if in doubt, don't "
+#~ "use."
+#~ msgstr ""
+#~ "Puede añadir, editar y borrar entradas de servicios WMS en la pestaña "
+#~ "Preferencias del componente WMSplugin. Una vez modificado estos cambios "
+#~ "se mostrarán en el menú WMS.\n"
+#~ "\n"
+#~ "También puede hacerlo manualmente en 'Preferencias avanzadas' usando el "
+#~ "siguiente esquema:\n"
+#~ "wmsplugin.url.1.name=Landsat\n"
+#~ "wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n"
+#~ "wmsplugin.url.2.name=NPE Maps... etc\n"
+#~ "\n"
+#~ "Ejemplo del formato de una URL completa del servicio WMS para Landsat\n"
+#~ "http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n"
+#~ "layers=global_mosaic&styles=&srs=EPSG:4326&\n"
+#~ "format=image/jpeg \n"
+#~ "\n"
+#~ "Para el restificador de mapas de Metacarta http://labs.metacarta.com/"
+#~ "rectifier/ únicamente necesita introducir el identificador 'id' que este "
+#~ "servicio le proporciona.\n"
+#~ "Para agregar una imagen de un mapa rectificada mediante esta utilidad de "
+#~ "Metacarta sustituya en esta URL de ejemplo el número 73 por el id que "
+#~ "identifica a su imagen: \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"
+#~ "Nota: Asegúrese que los derechos de autor de la imagen que vaya a "
+#~ "utilizar se adecúan a la licencia de OSM. Si duda, por favor, no la "
+#~ "utilice."
 
 #~ msgid "Portcullis"
@@ -22361,10 +22769,39 @@
 #~ msgstr "viaducto"
 
+#~ msgid "Open the OpenStreetBugs window and activate the automatic download"
+#~ msgstr "Abre la ventana de OpenStreetBugs y activa la descarga automática"
+
 #~ msgid "sports"
 #~ msgstr "Deportes"
 
+#~ msgid ""
+#~ "Lambert zone {0} in cache  incompatible with current Lambert zone {1}"
+#~ msgstr ""
+#~ "Zona Lambert {0} en la caché incompatible con la zona Lambert  actual {1}"
+
 #~ msgid "Delete and Download"
 #~ msgstr "Eliminar y descargar"
 
+#~ msgid "No intersections found. Nothing was changed."
+#~ msgstr "Ninguna intersección encontrada. No se han producido cambios."
+
+#~ msgid ""
+#~ "This action will require {0} individual download requests. Do you wish to "
+#~ "continue?"
+#~ msgstr ""
+#~ "Esta acción requiere de {0} solicitudes individuales de descargas. ¿Desea "
+#~ "continuar?"
+
+#~ msgid ""
+#~ "An error occured while trying to match the photos to the GPX track. You "
+#~ "can adjust the sliders to manually match the photos."
+#~ msgstr ""
+#~ "Se ha producido un error al tratar de hacer coincidir las fotografías con "
+#~ "la traza GPX. Puede ajustarlo regulándolo manualmente para hacer "
+#~ "coincidirlos.\""
+
+#~ msgid "The following errors occured during mass download:"
+#~ msgstr "Se han producido los siguientes errores durante la descarga masiva:"
+
 #~ msgid "Edit Drawbridge"
 #~ msgstr "Editar un puente levadizo"
@@ -22372,4 +22809,14 @@
 #~ msgid "Edit Portcullis"
 #~ msgstr "Editar rastrillo"
+
+#~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">english</A>."
+#~ msgstr "Página de ayuda perdida. Crearla en <A HREF=\"{0}\">english</A>."
+
+#~ msgid ""
+#~ "Helppage missing. Create it in <A HREF=\"{0}\">english</A> or <A HREF="
+#~ "\"{1}\">your language</A>."
+#~ msgstr ""
+#~ "Página de ayuda perdida. Crearla en <A HREF=\"{0}\">english</A> or <A "
+#~ "HREF=\"{1}\">spanish</A>."
 
 #~ msgid ""
@@ -22392,4 +22839,7 @@
 #~ msgstr "No iniciado"
 
+#~ msgid "Cannot read numeric value from response"
+#~ msgstr "No se puede leer el valor numérico de la respuesta"
+
 #~ msgid "Data upload failed for unknown reason"
 #~ msgstr "La subida de datos ha fallado por una razón desconocida"
Index: applications/editors/josm/i18n/po/et.po
===================================================================
--- applications/editors/josm/i18n/po/et.po	(revision 16008)
+++ 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>"
Index: applications/editors/josm/i18n/po/fi.po
===================================================================
--- applications/editors/josm/i18n/po/fi.po	(revision 16008)
+++ applications/editors/josm/i18n/po/fi.po	(revision 16009)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-14 16:51+0200\n"
-"PO-Revision-Date: 2009-06-09 18:00+0000\n"
+"POT-Creation-Date: 2009-06-19 21:52+0200\n"
+"PO-Revision-Date: 2009-06-14 17:42+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Finnish <fi@li.org>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-06-14 14:45+0000\n"
+"X-Launchpad-Export-Date: 2009-06-19 19:35+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 "Ohje"
 
 #: ../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 ""
 
@@ -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"
@@ -533,5 +535,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}"
@@ -603,6 +605,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:92
-msgid "Email"
-msgstr "Sähköpostiosoite"
+msgid "E-Mail"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:96
@@ -640,12 +642,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
@@ -672,5 +676,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
@@ -703,5 +707,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:207
 #, java-format
-msgid "Helppage missing. Create it in <A HREF=\"{0}\">english</A>."
+msgid "Help page missing. Create it in <A HREF=\"{0}\">english</A>."
 msgstr ""
 
@@ -709,5 +713,5 @@
 #, 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 ""
@@ -1139,13 +1143,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:99
 msgid "Status Report"
 msgstr "Raportti"
 
-#: ../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 "Kopioi leikepöydälle ja sulje"
 
-#: ../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
@@ -1347,16 +1351,14 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 "Lataa nykyisten karttatietojen uusimmat versiot palvelimelta."
 
-#: ../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?"
@@ -1364,89 +1366,259 @@
 "Ei päivitettäviä karttatietoja. Et ole ladannut etkä avannut karttatietoja."
 
-#: ../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 ""
-"Tämä toiminto vaatii {0} erillistä latauspyyntyöä. Oletko varma, että haluat "
-"jatkaa?"
-
-#: ../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 "Lähetä OSM-palvelimelle..."
 
-#: ../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 "Lähetä kaikki muutokset OSM-palvelimelle..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:96
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:94
 msgid "Objects to add:"
 msgstr "Lisättävät objektit:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102
 msgid "Objects to modify:"
 msgstr "Muokattavat objektit:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:110
 msgid "Objects to delete:"
 msgstr "Poistettavat objektit:"
 
-#: ../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 "Anna lyhyt kuvaus lähetettävistä muutoksista:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:126
 msgid "Upload these changes?"
 msgstr "Lähetetäänkö nämä muutokset?"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:130
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
 msgid "Upload Changes"
 msgstr "Lähetä muutokset"
 
-#: ../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 "Ei mitään lähetettävää. Hae ensin dataa."
 
-#: ../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 ""
 "Selvittämättömiä ristiriitoja. Ne tulee selvittää ennen muutosten lähetystä."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:182
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:180
 msgid "No changes to upload."
 msgstr "Ei lähetettäviä muutoksia."
 
-#: ../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 ""
@@ -1551,36 +1723,50 @@
 msgstr "Raaka GPS-data"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:44
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:46
 msgid "Downloading data"
 msgstr "Ladataan dataa"
 
-#: ../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 "Dataa ei tuotu."
 
-#: ../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 "Datataso {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 "OpenStreeMap-data"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:37
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:45
 msgid "Data Layer"
 msgstr "Datataso"
 
-#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:88
-msgid "The following errors occured during mass download:"
-msgstr ""
-
-#: ../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 ""
+
+#: ../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 ""
 
@@ -1635,34 +1821,34 @@
 msgstr "Maailman ulkopuolelle ei voi lisätä pistettä."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:495
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:493
 msgid "Add node"
 msgstr "Lisää piste"
 
-#: ../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 "Lisää piste polkuun"
 
-#: ../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 "Yhdistä olemassa oleva polku pisteeseen"
 
-#: ../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 "Lisää uusi piste olemassa olevaan polkuun"
 
-#: ../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 "Lisää piste polkuun ja yhdistä"
 
-#: ../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 "Luo uusi piste."
 
-#: ../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 "Valitse kursorin alla oleva piste."
 
-#: ../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."
@@ -1671,14 +1857,14 @@
 msgstr[1] "Lisää uusi piste {0} polkuun."
 
-#: ../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 "Aloita uusi polku viimeisestä pisteestä."
 
-#: ../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 "Jatka polkua viimeisestä pisteestä."
 
-#: ../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 "Lopeta piirtäminen."
@@ -1993,25 +2179,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 "Lataa valinta"
 
-#: ../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 "Ladataan..."
 
-#: ../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 "Ei voitu lukea URL:stä: \"{0}\""
 
-#: ../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 ""
 
@@ -2073,13 +2265,85 @@
 msgstr "Ratkaise {0} ristiriitaa {1} objektissa"
 
-#: ../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 "Poista {1} {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97
+#, java-format
+msgid "Delete {0} {1}"
+msgstr "Poista {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153
+msgid "Conflicting relation"
+msgstr "Ristiriidassa oleva relaatio"
+
+#: ../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 ""
+"Valinta \"{0}\" on jäsenenä {2} relaatiossa \"{1}\".\n"
+"Poistetaanko relaatiosta?"
+
+#: ../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 "Poista relaatiosta"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
+#, java-format
+msgid ""
+"Selection \"{0}\" is used by relation \"{1}\".\n"
+"Delete from relation?"
+msgstr ""
+"Valinta \"{0}\" on jäsenenä relaatiossa \"{1}\".\n"
+"Poistetaanko relaatiosta?"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:366
+msgid "Split way segment"
+msgstr "Katkaise polku"
+
+#. 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 ""
+"Olet aikeissa poistaa pisteitä ladatun alueen ulkopuolelta.<br>Tämä voi "
+"johtaa ongelmiin, koska objektit, joita et näe voivat käyttää niitä."
+"<br>Oletko varma, että haluat poistaa ne?"
+
+#: ../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 "Siirrä"
+
 #: ../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"
@@ -2088,10 +2352,221 @@
 msgstr[1] "pistettä"
 
-#: ../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 "Kierrä"
+
+#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88
+msgid "Sequence"
+msgstr "Komentosarja"
+
+#: ../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 "Toteutetaanko?"
+
+#: ../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 ""
+"Käännettäessä tätä polkua, seuraavat muutokset polun ja sen pisteiden "
+"ominaisuuksiin ovat suositeltuja."
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28
+msgid "Relation"
+msgstr "Relaatio"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30
+msgid "Old role"
+msgstr "Vanha rooli"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:32
+msgid "New role"
+msgstr "Uusi rooli"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
+msgid "Old key"
+msgstr "Vanha avain"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
+msgid "Old value"
+msgstr "Vanha arvo"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
+msgid "New key"
+msgstr "Uusi avain"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
+msgid "New value"
+msgstr "Uusi arvo"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:40
+msgid "Apply selected changes"
+msgstr "Toteuta valtiut muutokset"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41
+msgid "Don't apply changes"
+msgstr "Älä toteuta muutoksia"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:83
+msgid "Please select which property changes you want to apply."
+msgstr "Valitse, minkä ominaisuuden muutoksen haluat toteuttaa."
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:96
+msgid "Properties of "
+msgstr "Ominaisuudet: "
+
+#: ../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 "Automaattinen tagien korjaus"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:314
+#, java-format
+msgid "Malformed config file at lines {0}"
+msgstr "Konfiguraatiotiedostossa virhe riv(e)illä {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:324
+#, java-format
+msgid "Cannot open preferences directory: {0}"
+msgstr "Omien asetusten hakemistoa {0} ei voi avata."
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:342
+#, java-format
+msgid "Preferences file had errors. Making backup of old one to {0}."
+msgstr ""
+"Tiedostossa, jossa sijaitsevat omat asetuksesi on virhe. Vanhasta "
+"tiedostosta tehdään varmuuskopio: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:79
+#, java-format
+msgid "Preferences stored on {0}"
+msgstr "Asetukset tallennettu kohteeseen {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:82
+#, java-format
+msgid "Could not upload preferences. Reason: {0}"
+msgstr "Asetuksia ei voitu lähettää. Syy: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:93
+msgid "Could not load preferences from server."
+msgstr "Asetuksia ei voitu ladata palvelimelta."
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:34
+msgid "different"
+msgstr "eri"
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:262
+msgid "deleted"
+msgstr "poistettu"
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
+msgid "true"
+msgstr "tosi"
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
+msgid "false"
+msgstr "epätosi"
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20
+msgid "position"
+msgstr "sijainti"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30
+msgid "Decimal Degrees"
+msgstr "Asteina desimaalilukuna"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
+msgid "Degrees Minutes Seconds"
+msgstr "Asteina, minuutteina ja sekunteina"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+msgid "S"
+msgstr "E"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+msgid "N"
+msgstr "P"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+msgid "W"
+msgstr "L"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+msgid "E"
+msgstr "I"
+
+#: ../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 "keskeneräinen"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
+#, java-format
+msgid "Error: {0}"
+msgstr "Virhe: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
+#, java-format
+msgid "Warning: {0}"
+msgstr "Varoitus: {0}"
+
+#: ../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"
@@ -2100,8 +2575,10 @@
 msgstr[1] "polkua"
 
-#: ../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
@@ -2112,267 +2589,27 @@
 msgstr[1] "relaatiot"
 
-#: ../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 "Poista {1} {0}"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97
-#, java-format
-msgid "Delete {0} {1}"
-msgstr "Poista {0} {1}"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153
-msgid "Conflicting relation"
-msgstr "Ristiriidassa oleva relaatio"
-
-#: ../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 ""
-"Valinta \"{0}\" on jäsenenä {2} relaatiossa \"{1}\".\n"
-"Poistetaanko relaatiosta?"
-
-#: ../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 "Poista relaatiosta"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
-#, java-format
-msgid ""
-"Selection \"{0}\" is used by relation \"{1}\".\n"
-"Delete from relation?"
-msgstr ""
-"Valinta \"{0}\" on jäsenenä relaatiossa \"{1}\".\n"
-"Poistetaanko relaatiosta?"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:366
-msgid "Split way segment"
-msgstr "Katkaise polku"
-
-#. 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 ""
-"Olet aikeissa poistaa pisteitä ladatun alueen ulkopuolelta.<br>Tämä voi "
-"johtaa ongelmiin, koska objektit, joita et näe voivat käyttää niitä."
-"<br>Oletko varma, että haluat poistaa ne?"
-
-#: ../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 "Siirrä"
-
-#: ../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 "Kierrä"
-
-#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88
-msgid "Sequence"
-msgstr "Komentosarja"
-
-#: ../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 "Toteutetaanko?"
-
-#: ../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 ""
-"Käännettäessä tätä polkua, seuraavat muutokset polun ja sen pisteiden "
-"ominaisuuksiin ovat suositeltuja."
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28
-msgid "Relation"
-msgstr "Relaatio"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30
-msgid "Old role"
-msgstr "Vanha rooli"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:32
-msgid "New role"
-msgstr "Uusi rooli"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
-msgid "Old key"
-msgstr "Vanha avain"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
-msgid "Old value"
-msgstr "Vanha arvo"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
-msgid "New key"
-msgstr "Uusi avain"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
-msgid "New value"
-msgstr "Uusi arvo"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:40
-msgid "Apply selected changes"
-msgstr "Toteuta valtiut muutokset"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41
-msgid "Don't apply changes"
-msgstr "Älä toteuta muutoksia"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:83
-msgid "Please select which property changes you want to apply."
-msgstr "Valitse, minkä ominaisuuden muutoksen haluat toteuttaa."
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:96
-msgid "Properties of "
-msgstr "Ominaisuudet: "
-
-#: ../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 "Automaattinen tagien korjaus"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:314
-#, java-format
-msgid "Malformed config file at lines {0}"
-msgstr "Konfiguraatiotiedostossa virhe riv(e)illä {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:324
-#, java-format
-msgid "Cannot open preferences directory: {0}"
-msgstr "Omien asetusten hakemistoa {0} ei voi avata."
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:342
-#, java-format
-msgid "Preferences file had errors. Making backup of old one to {0}."
-msgstr ""
-"Tiedostossa, jossa sijaitsevat omat asetuksesi on virhe. Vanhasta "
-"tiedostosta tehdään varmuuskopio: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:79
-#, java-format
-msgid "Preferences stored on {0}"
-msgstr "Asetukset tallennettu kohteeseen {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:82
-#, java-format
-msgid "Could not upload preferences. Reason: {0}"
-msgstr "Asetuksia ei voitu lähettää. Syy: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:93
-msgid "Could not load preferences from server."
-msgstr "Asetuksia ei voitu ladata palvelimelta."
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:34
-msgid "different"
-msgstr "eri"
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:262
-msgid "deleted"
-msgstr "poistettu"
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
-msgid "true"
-msgstr "tosi"
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
-msgid "false"
-msgstr "epätosi"
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20
-msgid "position"
-msgstr "sijainti"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30
-msgid "Decimal Degrees"
-msgstr "Asteina desimaalilukuna"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
-msgid "Degrees Minutes Seconds"
-msgstr "Asteina, minuutteina ja sekunteina"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
-msgid "S"
-msgstr "E"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
-msgid "N"
-msgstr "P"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
-msgid "W"
-msgstr "L"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
-msgid "E"
-msgstr "I"
-
-#: ../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 "keskeneräinen"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
-#, java-format
-msgid "Error: {0}"
-msgstr "Virhe: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
-#, java-format
-msgid "Warning: {0}"
-msgstr "Varoitus: {0}"
-
-#: ../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"
@@ -2386,5 +2623,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:122
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "railway"
 msgstr "rata"
@@ -2406,4 +2643,62 @@
 msgstr[1] "{0} pistettä"
 
+#: ../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."
@@ -2552,5 +2847,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 "tausta"
@@ -2628,8 +2923,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
@@ -2641,7 +2936,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
@@ -2742,10 +3037,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 "Käyttäjänimi"
 
 #: ../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 "Salasana"
@@ -2839,22 +3134,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:146
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148
 msgid "File"
 msgstr "Tiedosto"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150
 msgid "View"
 msgstr "Näytä"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:149
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151
 msgid "Tools"
 msgstr "Työkalut"
 
-#: ../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 "Esivalinnat"
 
-#: ../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
@@ -2867,21 +3162,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 "Rautalankanäkymä"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:218
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221
 msgid "Toggle Wireframe view"
 msgstr "Vaihda rautalankanäkymän päälläoloa"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:244
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:247
 msgid "Full Screen"
 msgstr "Koko näyttö -tila"
 
-#: ../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 "Ääni"
@@ -2953,6 +3248,6 @@
 msgstr "(ei objektia)"
 
-#: ../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 "taso ei ole listassa."
@@ -2962,9 +3257,9 @@
 msgstr "Yhdistetään OSM-palvelimeen..."
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:104
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:105
 msgid "Error while parsing"
 msgstr "Virhe jäsennettäessä"
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:107
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:108
 msgid "File not found"
 msgstr "Tiedostoa ei löytynyt"
@@ -3036,5 +3331,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 "Jäsenet"
@@ -3230,5 +3525,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
@@ -3310,5 +3605,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 ""
@@ -3347,5 +3642,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 ""
 
@@ -3399,5 +3694,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 "Rooli"
@@ -3502,5 +3797,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
@@ -3811,5 +4106,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 "Relaatiot"
@@ -3916,66 +4211,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 "Toteuta muutokset"
 
-#: ../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 "Perus"
 
-#: ../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 "Jäsen"
 
-#: ../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 "Tagit (tyhjä arvo poistaa tagin)"
 
-#: ../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 "Siirrä ylöspäin"
 
-#: ../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 "Siirrä valittuja jäseniä ylöspäin"
 
-#: ../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 "Lisää valitut"
 
-#: ../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 "Lisää valitut objektit jäseniksi"
 
-#: ../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 "Poista valitut"
 
-#: ../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 "Poista kaikki valitut objektit relaatiosta"
 
-#: ../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 "Siirrä alaspäin"
 
-#: ../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 "Siirrä valittuja jäseniä alaspäin"
 
-#: ../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 "Poista taulukon aktiivisella rivillä oleva jäsen relaatiosta"
 
-#: ../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 "Lataa jäsenet"
 
-#: ../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 "Lataa kaikki keskeneräiset polut ja pisteet relaatiossa"
@@ -4020,5 +4315,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
@@ -4039,9 +4334,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 "kyllä"
 
-#: ../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
@@ -4063,31 +4358,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 "ei"
 
-#: ../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 "Jäsenet: {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 "Relaatioeditori: {0}"
 
-#: ../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 "Tuonnin aikana oli ristiriitoja."
 
-#: ../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 "Virhe palvelimen vastauksen käsittelyssä."
 
-#: ../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 "Palvelimeen ei voida yhdistää."
+
+#: ../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
@@ -4153,17 +4451,17 @@
 msgstr "Datalähteet ja -tyypit"
 
-#: ../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 "Lataa uutena tasona"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:174
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:173
 msgid "Download Area"
 msgstr "Lataa alue"
 
-#: ../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 "Ladattava alue on liian iso, palvelin todennäköisesti hylkää pyynnön"
 
-#: ../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 ""
@@ -4192,5 +4490,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 "Paikat"
@@ -4237,21 +4535,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 "tyyppi"
@@ -4291,16 +4589,4 @@
 msgid "Tile Numbers"
 msgstr "Karttaruutujen numerot"
-
-#: ../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 ""
-"Voit käyttää hiirtä tai Ctrl+nuolinäppäimet lähentääksesi/loitontaaksesi ja "
-"siirtääksesi näkymää."
-
-#. 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 "Kartta"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:98
@@ -4379,5 +4665,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)"
@@ -4493,14 +4779,14 @@
 msgstr "Ääniaaltotiedostot (*.wav)"
 
-#: ../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 "Tuo kuvia"
 
-#: ../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, "
@@ -4509,5 +4795,5 @@
 msgstr[1] "{0} jälkeä, "
 
-#: ../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, "
@@ -4516,5 +4802,5 @@
 msgstr[1] "{0} reittiä, "
 
-#: ../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"
@@ -4523,28 +4809,28 @@
 msgstr[1] "{0} reittipistettä"
 
-#: ../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 "Nimi: {0}"
 
-#: ../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 "Kuvaus: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347
 msgid "Timespan: "
 msgstr "Ajanjakso: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354
 msgid "Length: "
 msgstr "Pituus: "
 
-#: ../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 "Muuta datatasoksi"
 
-#: ../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 ""
@@ -4555,11 +4841,11 @@
 "haitallisena.<br>Jos haluat lähettää jälkiä, katso:"
 
-#: ../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
@@ -4569,29 +4855,29 @@
 msgstr "Muutettu jäljestä {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 "Lataa data OSM-palvelimelta tämän jäljen varrelta"
 
-#: ../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 "Lataa kaikki  alueella:"
 
-#: ../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 "{0} metriä"
 
-#: ../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 "Yhden pyynnön enimmäisalue:"
 
-#: ../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 "{0} neliökilometriä"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:822
 #, java-format
 msgid ""
@@ -4600,9 +4886,9 @@
 msgstr "<html>Tämä vaatii {0} erillistä latauspyyntöä.<br>Jatketaanko?</html>"
 
-#: ../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 "Tasolla ei ole yhtään GPX-jälkeä, johon liittää äänitiedosto."
 
-#: ../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 "
@@ -4610,5 +4896,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 "
@@ -4616,33 +4902,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 "ladatun alueen ulkopuolella"
 
-#: ../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 "{0} koostuu:"
 
-#: ../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} poistettu)"
 
-#: ../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"
@@ -4650,21 +4945,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"
@@ -4806,5 +5101,5 @@
 msgstr "Oletusarvo on tuntematon (asetusta ei ole vielä käytetty)"
 
-#: ../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
@@ -4813,5 +5108,5 @@
 msgstr "Ole hyvä ja valitse muokattava rivi."
 
-#: ../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
@@ -4819,5 +5114,5 @@
 msgstr "Uusi arvo {0}:lle"
 
-#: ../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
@@ -4827,5 +5122,5 @@
 msgstr "Ole hyvä ja valitse poistettava rivi."
 
-#: ../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 "Anna uusi avain/arvo-pari"
@@ -5704,106 +5999,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"
@@ -6275,6 +6570,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:36
-msgid "Login name (email) to the OSM account."
-msgstr "OSM-tilin kirjautumisnimi (sähköpostiosoite)."
+msgid "Login name (e-mail) to the OSM account."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
@@ -6288,6 +6583,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
-msgid "OSM username (email)"
-msgstr "OSM-käyttäjänimi (sähköpostiosoite)"
+msgid "OSM username (e-mail)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
@@ -6298,10 +6593,7 @@
 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 ""
-"<html>VAROITUS: Salasana on tallennettu asetustiedostoon ilman minkäänlaista "
-"salausta.<br>Salasana lähetetään salaamattomana palvelimelle URL-osoitteessa."
-"</br><b>Älä käytä arvokasta salasanaa.</b></html>"
 
 #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on
@@ -6607,6 +6899,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 "Yhdistetään OSM-palvelimeen..."
@@ -6617,7 +6910,7 @@
 msgstr "Ladataan pisteet {0}-{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 "Ladataan OSM-karttatietoja..."
@@ -6682,15 +6975,14 @@
 msgstr "NMEA-tuonti epäonnistui"
 
-#: ../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 ""
@@ -6699,31 +6991,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 "Luodaan muutoskokoelma..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:351
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298
 msgid "Closing changeset..."
 msgstr "Suljetaan muutoskokoelma..."
 
-#: ../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 "Valmistellaan..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:381
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:326
 msgid "Uploading..."
 msgstr "Lähetetään..."
@@ -6738,25 +7036,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 "Virheellinen salasana tai käyttäjänimi."
 
-#: ../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 "Varoitus: salasana lähetetään salaamattomana."
 
-#: ../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 "Tallenna käyttäjänimi ja salasana (salaamattomana)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:89
 msgid "Enter Password"
 msgstr "Anna salasana"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
 msgid "Login"
 msgstr "Kirjaudu sisään"
 
-#: ../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..."
@@ -6767,4 +7065,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."
@@ -6857,26 +7198,32 @@
 msgstr "Vääränlainen pisteen id"
 
-#: ../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 "Yhdistetään palvelimeen..."
 
-#: ../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 "OSM-palvelimeen ei voitu yhdistää. Tarkista internetyhteytesi."
 
-#: ../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 ""
-"Palvelin palautti sisäisen virheen. Kokeile ladata pienempi alue tai yritä "
-"myöhemmin uudestaan."
-
-#: ../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 ""
 
@@ -6892,5 +7239,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 "Lataa liitännäiset"
@@ -7078,9 +7425,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 "Lataa puuttuvat liitännäiset"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:128
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:119
 #, java-format
 msgid ""
@@ -7093,6 +7440,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
@@ -7115,35 +7462,35 @@
 msgstr "tuntematon"
 
-#: ../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}: Versio {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 "Liitännäinen tulee JOSM:n mukana"
 
-#: ../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 "Virhe luettaessa liitännäisten tiedot sisältävää tiedostoa: {0}"
 
-#: ../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 "Tämä on nauhoituksen lopun jälkeen"
 
-#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:329
+#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:340
 msgid "Error playing sound"
 msgstr "Virhe äänentoistossa"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
 msgid "Do nothing"
 msgstr "Älä tee mitään"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
 msgid "Report Bug"
 msgstr "Ilmoita ohjelmavirheestä"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:52
 msgid ""
 "An unexpected exception occurred.\n"
@@ -7157,14 +7504,14 @@
 "JOSM:n versiota, ilmoita ohjelmavirheestä."
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55
 msgid "Unexpected Exception"
 msgstr "Odottamaton poikkeus"
 
-#: ../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 "Tee virheilmoitus osoitteessa {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 ""
@@ -7172,5 +7519,5 @@
 "virhetilanteeseen."
 
-#: ../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 "
@@ -7180,9 +7527,9 @@
 "kirjoittamista."
 
-#: ../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 "Varmista, että ilmoituksesa on ainakin seuraavat tiedot:"
 
-#: ../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 "(Teksti on jo kopioitu leikepöydälle)"
@@ -7266,5 +7613,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 "Kuvaus"
@@ -7639,5 +7986,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 ""
@@ -7671,5 +8018,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"
@@ -7692,5 +8038,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
@@ -7781,6 +8127,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/"
@@ -7856,6 +8202,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
@@ -7863,11 +8209,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 ""
@@ -7884,13 +8230,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 ""
@@ -7911,5 +8257,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 ""
 
@@ -8002,5 +8348,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
@@ -8008,59 +8354,28 @@
 msgstr "Tyhjä taso"
 
+#: ../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 "Tallenna WMS-taso tiedostoon"
-
-#: ../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 "Lataa WMS-taso tiedostosta"
-
-#: ../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 ""
@@ -8069,14 +8384,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 ""
@@ -8171,11 +8486,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 "Tuo jälki GPX-tasolta"
 
 #: ../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 "Poista olemassa oleva jälki"
@@ -8185,5 +8500,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 "GPX-tasoa ei löytynyt."
@@ -8471,4 +8786,8 @@
 msgid "Lakewalker trace"
 msgstr "Lakewalker-ääriviiva"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:10
+msgid "An unknown error has occurred"
+msgstr ""
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
@@ -8789,42 +9108,42 @@
 msgstr "LiveGPS"
 
-#: ../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 "Mitatut arvot"
 
-#: ../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 "Avaa mittausikkuna."
 
-#: ../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 "Nollaa"
 
-#: ../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 "Nollaa mittaustulokset ja poistaa mittausjäljen."
 
-#: ../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 "Jäljen pituus"
 
-#: ../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 "Valinnan pituus"
 
-#: ../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 "Valinnan alue"
 
-#: ../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 "Kulma"
 
-#: ../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 "Kahden pisteen välinen kulma"
 
-#: ../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 "Taso, jolla tehdään mittaukset"
@@ -8883,6 +9202,6 @@
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
-msgid "Open the OpenStreetBugs window and activate the automatic download"
-msgstr "Avaa OpenStreetBugs-ikkuna ja aktivoi automaattinen lataus"
+msgid "Opens the OpenStreetBugs window and activates the automatic download"
+msgstr ""
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:123
@@ -8959,5 +9278,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 "
@@ -8967,9 +9286,9 @@
 "asetusten karttasivulta."
 
-#: ../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 ""
@@ -9398,5 +9717,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 "Kadunnimi"
@@ -9492,5 +9811,5 @@
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:195
-msgid "No intersections found. Nothing was changed."
+msgid "No intersection found. Nothing was changed."
 msgstr ""
 
@@ -10380,19 +10699,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 ""
@@ -10451,5 +10769,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113
 #, java-format
 msgid ""
@@ -10493,4 +10811,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 "Tallenna WMS-taso tiedostoon"
+
+#: ../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 "Lataa WMS-taso tiedostosta"
+
+#: ../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 ""
 
@@ -10584,4 +10927,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 ""
@@ -10596,5 +10944,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 ""
 
@@ -10878,5 +11226,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 "Numero"
@@ -11378,5 +11726,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 ""
@@ -11845,7 +12193,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 "Tyyppi"
@@ -12461,10 +12809,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 "Operaattori"
@@ -12676,7 +13024,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 ""
@@ -13608,5 +13956,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 "Maksu"
@@ -13742,5 +14090,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 ""
@@ -13748,5 +14096,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 "Alue"
@@ -13798,11 +14146,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 ""
@@ -13810,5 +14168,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1512
+#: build/trans_presets.java:1513
 msgid "Taxi"
 msgstr "Taksi"
@@ -13816,5 +14174,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 "Muokkaa taksitolppaa"
@@ -13822,5 +14180,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1519
+#: build/trans_presets.java:1520
 msgid "Airport"
 msgstr "Lentokenttä"
@@ -13828,15 +14186,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 "IATA"
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1527
+#: build/trans_presets.java:1528
 msgid "ICAO"
 msgstr "ICAO"
@@ -13845,5 +14203,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1532
+#: build/trans_presets.java:1533
 msgid "Accomodation"
 msgstr "Majoittuminen"
@@ -13855,5 +14213,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 "Hotelli"
@@ -13862,15 +14220,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 "Muokkaa hotellia"
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1539
+#: build/trans_presets.java:1540
 msgid "Stars"
 msgstr "Tähdet"
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1541
+#: build/trans_presets.java:1542
 msgid "Motel"
 msgstr "Motelli"
@@ -13878,20 +14236,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 "Muokkaa motellin ominaisuuksia"
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1547
+#: build/trans_presets.java:1548
 msgid "Guest House"
 msgstr "Vierasmaja"
 
 #. item
-#: build/trans_presets.java:1548
+#: build/trans_presets.java:1549
 msgid "Edit Guest House"
 msgstr "Muokkaa vierasmajan ominaisuuksia"
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1552
+#: build/trans_presets.java:1553
 msgid "Chalet"
 msgstr "Alppimaja"
@@ -13899,10 +14257,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 "Hostelli"
@@ -13910,30 +14268,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 "Matkailuvaunualue"
 
 #. item
-#: build/trans_presets.java:1571
+#: build/trans_presets.java:1572
 msgid "Edit Caravan Site"
 msgstr "Muokkaa matkailuvaunualueen ominaisuuksia"
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1575
+#: build/trans_presets.java:1576
 msgid "Camping Site"
 msgstr "Leirintäalue"
@@ -13941,10 +14299,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 "Ruoka ja juoma"
@@ -13955,5 +14313,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 "Ravintola"
@@ -13961,5 +14319,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 "Muokkaa ravintolan ominaisuuksia"
@@ -13967,5 +14325,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 ""
@@ -13973,61 +14331,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 "italialainen"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "chinese"
 msgstr "kiinalainen"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "burger"
 msgstr "hampurilainen"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "greek"
 msgstr "kreikkalainen"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "german"
 msgstr "saksalainen"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "indian"
 msgstr "intialainen"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "regional"
 msgstr "paikallinen"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "turkish"
 msgstr "turkkilainen"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "asian"
 msgstr "aasialainen"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "thai"
 msgstr "thaimaalainen"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "mexican"
 msgstr "meksikolainen"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "japanese"
 msgstr "japanilainen"
 
-#: build/trans_presets.java:1590
+#: build/trans_presets.java:1591
 msgid "Fast Food"
 msgstr "Pikaruoka"
@@ -14035,9 +14393,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 "Muokkaa pikaruokalan ominaisuuksia"
 
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1598
 msgid "Cafe"
 msgstr "Kahvila"
@@ -14045,10 +14403,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 "Muokkaa kahvilan ominaisuuksia"
 
 #. item "Food+Drinks/Cafe" text "Name"
-#: build/trans_presets.java:1603
+#: build/trans_presets.java:1604
 msgid "Pub"
 msgstr ""
@@ -14056,20 +14414,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 ""
@@ -14077,10 +14435,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 "Yökerho"
@@ -14088,20 +14446,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 "Muokkaa yökerhon ominaisuuksia"
 
 #. item "Food+Drinks/Nightclub" text "Name"
-#: build/trans_presets.java:1627
+#: build/trans_presets.java:1628
 msgid "Tourism"
 msgstr "Turismi"
 
 #. group "Tourism"
-#: build/trans_presets.java:1628
+#: build/trans_presets.java:1629
 msgid "Attraction"
 msgstr "Nähtävyys"
 
 #. item
-#: build/trans_presets.java:1629
+#: build/trans_presets.java:1630
 msgid "Edit Attraction"
 msgstr ""
@@ -14110,11 +14468,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 "Aukioloajat"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1634
+#: build/trans_presets.java:1635
 msgid "Museum"
 msgstr "Museo"
@@ -14122,10 +14480,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 "Muokkaa museon ominaisuuksia"
 
 #. item "Tourism/Museum" text "Name"
-#: build/trans_presets.java:1640
+#: build/trans_presets.java:1641
 msgid "Zoo"
 msgstr "Eläintarha"
@@ -14134,10 +14492,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 "Muokkaa eläintarhan ominaisuuksia"
 
 #. item "Tourism/Zoo" text "Name"
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1648
 msgid "Viewpoint"
 msgstr "Näköalapaikka"
@@ -14145,25 +14503,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 "Muokkaa näköalapaikan ominaisuuksia"
 
 #. 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 "Teemapuisto"
 
 #. 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 "Taideteos"
@@ -14171,5 +14529,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 ""
@@ -14177,5 +14535,5 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1667
 msgid "Information Office"
 msgstr ""
@@ -14183,83 +14541,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 "Kartta"
+
 #. 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 "kartta"
 
-#: 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 "pyöräkartta"
 
 #. 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 "historia"
 
-#: 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 ""
@@ -14267,25 +14622,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 "Piknik-paikka"
 
 #. item
-#: build/trans_presets.java:1709
+#: build/trans_presets.java:1710
 msgid "Edit Picnic Site"
 msgstr "Muokkaa piknik-paikan ominaisuuksia"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1716
 msgid "Historic Places"
 msgstr "Historialliset paikat"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1716
+#: build/trans_presets.java:1717
 msgid "Castle"
 msgstr "Linna"
@@ -14294,20 +14649,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 "Muokkaa linnan ominaisuuksia"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1724
 msgid "Ruins"
 msgstr "Rauniot"
 
 #. item
-#: build/trans_presets.java:1724
+#: build/trans_presets.java:1725
 msgid "Edit Ruins"
 msgstr "Muokkaa raunioiden ominaisuuksia"
 
 #. item "Historic Places/Ruins" text "Name"
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1729
 msgid "Archaeological Site"
 msgstr "Arkeologinen kaivaus"
@@ -14316,10 +14671,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 "Taistelukenttä"
@@ -14327,5 +14682,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 ""
@@ -14333,15 +14688,15 @@
 #. item "Historic Places/Battlefield" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1743
 msgid "Monument"
 msgstr "Monumentti"
 
 #. 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 "Muistomerkki"
@@ -14349,45 +14704,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 "Vapaa-ajanviete"
 
 #. group "Leisure"
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1766
 msgid "Water Park"
 msgstr "Vesipuisto"
 
 #. item
-#: build/trans_presets.java:1766
+#: build/trans_presets.java:1767
 msgid "Edit Water Park"
 msgstr "Muokkaa vesipuiston ominaisuuksia"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1770
+#: build/trans_presets.java:1771
 msgid "Playground"
 msgstr "Leikkipuisto"
@@ -14395,15 +14750,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 "Muokkaa leikkipuiston ominaisuuksia"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1776
+#: build/trans_presets.java:1777
 msgid "Fishing"
 msgstr "Kalastus"
 
 #. item
-#: build/trans_presets.java:1777
+#: build/trans_presets.java:1778
 msgid "Edit Fishing"
 msgstr ""
@@ -14411,15 +14766,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 "Stadion"
 
 #. item
-#: build/trans_presets.java:1785
+#: build/trans_presets.java:1786
 msgid "Edit Stadium"
 msgstr "Muokkaa stadionin ominaisuuksia"
@@ -14433,6 +14788,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 "Valitse urheilulaji:"
@@ -14808,6 +15163,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
@@ -14840,227 +15195,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 "jousiammunta"
 
-#: 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 "australialainen jalkapallo"
 
-#: 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 "baseball"
 
-#: 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 "koripallo"
 
-#: 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 "kuulapelit"
 
-#: 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 "kiipeily"
 
-#: 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 "kriketti"
 
-#: 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 "krikettiverkko"
 
-#: 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 "kroketti"
 
-#: 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 "pyöräily"
 
-#: 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 "ratsastus"
 
-#: 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 "amerikkalainen jalkapallo"
 
-#: 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 "golf"
 
-#: 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 "voimistelu"
 
-#: 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 "jääkiekko"
 
-#: 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 "rugby"
 
-#: 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 "ammunta"
 
-#: 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 "jalkapallo"
 
-#: 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 "uinti"
 
-#: 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 "pöytätennis"
 
-#: 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 "tennis"
 
-#: build/trans_presets.java:1793
+#: build/trans_presets.java:1794
 msgid "Sports Centre"
 msgstr "Urheilukeskus"
 
 #. item
-#: build/trans_presets.java:1794
+#: build/trans_presets.java:1795
 msgid "Edit Sports Centre"
 msgstr "Muokkaa urheilukeskuksen ominaisuuksia"
 
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1803
 msgid "Pitch"
 msgstr "Kenttä"
 
 #. item
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1804
 msgid "Edit Pitch"
 msgstr "Muokkaa kentän ominaisuuksia"
 
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1812
 msgid "Racetrack"
 msgstr "Kilparata"
 
 #. item
-#: build/trans_presets.java:1812
+#: build/trans_presets.java:1813
 msgid "Edit Racetrack"
 msgstr "Muokkaa kilparadan ominaisuuksia"
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1821
 msgid "Golf Course"
 msgstr "Golfkenttä"
 
 #. item
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1822
 msgid "Edit Golf Course"
 msgstr "Muokkaa golf-kentän ominaisuuksia"
 
 #. item "Sport Facilities/Golf Course" text "Name"
-#: build/trans_presets.java:1825
+#: build/trans_presets.java:1826
 msgid "Miniature Golf"
 msgstr "Pienoisgolf"
 
 #. item
-#: build/trans_presets.java:1826
+#: build/trans_presets.java:1827
 msgid "Edit Miniature Golf"
 msgstr "Muokkaa minigolfin ominaisuuksia"
 
 #. item "Sport Facilities/Miniature Golf" text "Name"
-#: build/trans_presets.java:1831
+#: build/trans_presets.java:1832
 msgid "Sport"
 msgstr "Urheilu"
 
 #. 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 ""
@@ -15099,191 +15454,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 "kenttä"
 
-#: 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 "urheilukeskus"
 
-#: 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 "stadion"
 
-#: 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 "Jousiammunta"
 
 #. 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 "Kiipeily"
 
 #. 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 "Pyöräily"
 
 #. 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 "Ratsastus"
 
 #. 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 "Voimistelu"
 
 #. 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 "Moottoriurheilu"
 
 #. item
-#: build/trans_presets.java:1899
+#: build/trans_presets.java:1900
 msgid "Edit Motor Sports"
 msgstr "Muokkaa moottoriurheilun ominaisuuksia"
 
-#: 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 "Unti"
 
 #. 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 ""
@@ -15291,56 +15646,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 ""
 
 #. 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 ""
 
-#: 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 ""
 
-#: 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 "Ammunta"
@@ -15348,178 +15703,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 "Pallopelit"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1941
 msgid "Soccer"
 msgstr "Jalkapallo"
 
 #. 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 "Amerikkalainen jalkapallo"
 
 #. 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 "Australialainen jalkapallo"
 
 #. 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 "Baseball"
 
 #. item
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:1960
 msgid "Edit Baseball"
 msgstr ""
 
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:1965
 msgid "Basketball"
 msgstr "Koripallo"
 
 #. item
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:1966
 msgid "Edit Basketball"
 msgstr ""
 
-#: 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 "golfkenttä"
 
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:1977
 msgid "Boule"
 msgstr "Kuulapeli"
 
 #. item
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:1978
 msgid "Edit Boule"
 msgstr "Muokkaa kuulapelin ominaisuuksia"
 
-#: 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 "Kriketti"
 
 #. item
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:1990
 msgid "Edit Cricket"
 msgstr "Muokkaa kriketin ominaisuuksia"
 
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:1995
 msgid "Cricket Nets"
 msgstr "Krikettiverkko"
 
 #. item
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:1996
 msgid "Edit Cricket Nets"
 msgstr "Muokkaa krikettiverkon ominaisuuksia"
 
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:2001
 msgid "Croquet"
 msgstr "Kroketti"
 
 #. 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 "Jääkiekko"
 
 #. item
-#: build/trans_presets.java:2007
+#: build/trans_presets.java:2008
 msgid "Edit Hockey"
 msgstr "Muokkaa jääkiekkopaikan ominaisuuksia"
 
-#: 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 "Rugby"
 
 #. item
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2026
 msgid "Edit Rugby"
 msgstr ""
 
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:2031
 msgid "Table Tennis"
 msgstr "Pöytätennis"
 
 #. item
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2032
 msgid "Edit Table Tennis"
 msgstr ""
 
-#: 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 ""
 
 #. <separator/>
-#: build/trans_presets.java:2044
+#: build/trans_presets.java:2045
 msgid "Buildings"
 msgstr "Rakennukset"
 
 #. group "Buildings"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2046
 msgid "Building"
 msgstr "Rakennus"
@@ -15527,5 +15882,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2049
 msgid "Public Building"
 msgstr "Julkinen rakennus"
@@ -15533,10 +15888,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 "Muokkaa julkisen rakennuksen ominaisuuksia"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2055
 msgid "Town hall"
 msgstr "Kaupungintalo"
@@ -15544,10 +15899,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 "Muokkaa kaupungintalon ominaisuuksia"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2061
 msgid "Embassy"
 msgstr "Suurlähetystö"
@@ -15555,10 +15910,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 "Muokkaa suurlähetystön ominaisuuksia"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2066
+#: build/trans_presets.java:2067
 msgid "Courthouse"
 msgstr "Oikeustalo"
@@ -15567,10 +15922,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 "Muokkaa oikeustalon ominaisuuksia"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2074
 msgid "Prison"
 msgstr "Vankila"
@@ -15579,10 +15934,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 "Muokkaa vankilan ominaisuuksia"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2080
+#: build/trans_presets.java:2081
 msgid "Police"
 msgstr "Poliisiasema"
@@ -15592,10 +15947,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 "Muokkaa poliisiaseman ominaisuuksia"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2089
 msgid "Fire Station"
 msgstr "Paloasema"
@@ -15604,10 +15959,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 "Muokkaa paloaseman ominaisuuksia"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2096
 msgid "Post Office"
 msgstr "Postitoimisto"
@@ -15615,5 +15970,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 "Muokkaa postitoimiston ominaisuuksia"
@@ -15621,15 +15976,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2103
 msgid "Kindergarten"
 msgstr "Lastentarha"
 
 #. item
-#: build/trans_presets.java:2103
+#: build/trans_presets.java:2104
 msgid "Edit Kindergarten"
 msgstr "Muokkaa lastentarhan ominaisuuksia"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2108
 msgid "School"
 msgstr "Koulu"
@@ -15637,10 +15992,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 "Muokkaa koulun ominaisuuksia"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2114
 msgid "University"
 msgstr "Yliopisto"
@@ -15648,10 +16003,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 "Muokkaa yliopiston ominaisuuksia"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2120
 msgid "College"
 msgstr "Korkeakoulu"
@@ -15659,5 +16014,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 "Muokkaa korkeakoulun ominaisuuksia"
@@ -15665,5 +16020,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2126
+#: build/trans_presets.java:2127
 msgid "Cinema"
 msgstr "Elokuvateatteri"
@@ -15672,10 +16027,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 "Muokkaa elokuvateatterin ominaisuuksia"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2133
+#: build/trans_presets.java:2134
 msgid "Library"
 msgstr "Kirjasto"
@@ -15684,10 +16039,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 "Muokkaa kirjaston ominaisuuksia"
 
 #. item "Buildings/Library" text "Name"
-#: build/trans_presets.java:2140
+#: build/trans_presets.java:2141
 msgid "Arts Centre"
 msgstr "Taidekeskus"
@@ -15695,10 +16050,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 "Muokkaa taidekeskuksen ominaisuuksia"
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2146
+#: build/trans_presets.java:2147
 msgid "Theatre"
 msgstr "Teatteri"
@@ -15707,10 +16062,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 "Muokkaa teatterin ominaisuuksia"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2154
 msgid "Place of Worship"
 msgstr ""
@@ -15720,5 +16075,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 ""
@@ -15727,6 +16082,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 "Uskonto"
@@ -15735,66 +16090,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
-msgid "bahai"
-msgstr ""
-
-#: build/trans_presets.java:2160 build/trans_presets.java:2881
-#: build/trans_presets.java:2890
-msgid "buddhist"
-msgstr ""
-
-#: build/trans_presets.java:2160 build/trans_presets.java:2881
-#: build/trans_presets.java:2890
-msgid "christian"
-msgstr ""
-
-#: build/trans_presets.java:2160 build/trans_presets.java:2881
-#: build/trans_presets.java:2890
-msgid "hindu"
-msgstr ""
-
-#: build/trans_presets.java:2160 build/trans_presets.java:2881
-#: build/trans_presets.java:2890
-msgid "jain"
-msgstr ""
-
-#: build/trans_presets.java:2160 build/trans_presets.java:2881
-#: build/trans_presets.java:2890
-msgid "jewish"
-msgstr ""
-
-#: build/trans_presets.java:2160 build/trans_presets.java:2881
-#: build/trans_presets.java:2890
-msgid "muslim"
-msgstr ""
-
-#: build/trans_presets.java:2160 build/trans_presets.java:2881
-#: build/trans_presets.java:2890
-msgid "sikh"
-msgstr ""
-
-#: build/trans_presets.java:2160 build/trans_presets.java:2881
-#: build/trans_presets.java:2890
-msgid "spiritualist"
-msgstr ""
-
-#: build/trans_presets.java:2160 build/trans_presets.java:2881
-#: build/trans_presets.java:2890
-msgid "taoist"
-msgstr ""
-
-#: build/trans_presets.java:2160 build/trans_presets.java:2881
-#: build/trans_presets.java:2890
-msgid "unitarian"
-msgstr ""
-
-#: build/trans_presets.java:2160 build/trans_presets.java:2881
-#: build/trans_presets.java:2890
-msgid "zoroastrian"
-msgstr ""
-
 #: build/trans_presets.java:2161 build/trans_presets.java:2882
 #: build/trans_presets.java:2891
+msgid "bahai"
+msgstr ""
+
+#: build/trans_presets.java:2161 build/trans_presets.java:2882
+#: build/trans_presets.java:2891
+msgid "buddhist"
+msgstr ""
+
+#: build/trans_presets.java:2161 build/trans_presets.java:2882
+#: build/trans_presets.java:2891
+msgid "christian"
+msgstr ""
+
+#: build/trans_presets.java:2161 build/trans_presets.java:2882
+#: build/trans_presets.java:2891
+msgid "hindu"
+msgstr ""
+
+#: build/trans_presets.java:2161 build/trans_presets.java:2882
+#: build/trans_presets.java:2891
+msgid "jain"
+msgstr ""
+
+#: build/trans_presets.java:2161 build/trans_presets.java:2882
+#: build/trans_presets.java:2891
+msgid "jewish"
+msgstr ""
+
+#: build/trans_presets.java:2161 build/trans_presets.java:2882
+#: build/trans_presets.java:2891
+msgid "muslim"
+msgstr ""
+
+#: build/trans_presets.java:2161 build/trans_presets.java:2882
+#: build/trans_presets.java:2891
+msgid "sikh"
+msgstr ""
+
+#: build/trans_presets.java:2161 build/trans_presets.java:2882
+#: build/trans_presets.java:2891
+msgid "spiritualist"
+msgstr ""
+
+#: build/trans_presets.java:2161 build/trans_presets.java:2882
+#: build/trans_presets.java:2891
+msgid "taoist"
+msgstr ""
+
+#: build/trans_presets.java:2161 build/trans_presets.java:2882
+#: build/trans_presets.java:2891
+msgid "unitarian"
+msgstr ""
+
+#: build/trans_presets.java:2161 build/trans_presets.java:2882
+#: build/trans_presets.java:2891
+msgid "zoroastrian"
+msgstr ""
+
+#: build/trans_presets.java:2162 build/trans_presets.java:2883
+#: build/trans_presets.java:2892
 msgid "Denomination"
 msgstr ""
@@ -15803,81 +16158,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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 "Osoitteet"
@@ -15886,5 +16241,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 "Muokkaa osoitetietoja"
@@ -15892,5 +16247,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2169
+#: build/trans_presets.java:2170
 msgid "House number"
 msgstr "Talon numero"
@@ -15898,20 +16253,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2172
 msgid "House name"
 msgstr "Talon nimi"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2174
 msgid "City name"
 msgstr "Kaupungin nimi"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2174
+#: build/trans_presets.java:2175
 msgid "Post code"
 msgstr "Postinumero"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2176
 msgid "Country code"
 msgstr "Maakoodi"
@@ -15919,5 +16274,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2179
 msgid "Address Interpolation"
 msgstr "Talonumeroiden interpolointilinja"
@@ -15926,5 +16281,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 "Muokkaa interpolointilinjaa"
@@ -15932,71 +16287,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 "pariton"
 
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2184
 msgid "even"
 msgstr "parillinen"
 
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2184
 msgid "all"
 msgstr "kaikki"
 
-#: 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 ""
 
 #. group "Man Made"
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2188
 msgid "Works"
 msgstr "Tehdas"
 
 #. item
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2189
 msgid "Edit Works"
 msgstr "Muokkaa tehtaan ominaisuuksia"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2193
 msgid "Tower"
 msgstr "Torni"
 
 #. item
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2194
 msgid "Edit Tower"
 msgstr "Muokkaa tornin ominaisuuksia"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2198
 msgid "Water Tower"
 msgstr "Vesitorni"
 
 #. item
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2199
 msgid "Edit Water Tower"
 msgstr "Muokkaa vesitornin ominaisuuksia"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2203
 msgid "Gasometer"
 msgstr "Kaasukello"
 
 #. item
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2204
 msgid "Edit Gasometer"
 msgstr "Muokkaa kaasukellon ominaisuuksia"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2207
+#: build/trans_presets.java:2208
 msgid "Lighthouse"
 msgstr "Majakka"
@@ -16004,10 +16359,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 "Muokkaa majakan ominaisuuksia"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2214
 msgid "Windmill"
 msgstr "Tuulimylly"
@@ -16015,10 +16370,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 "Muokkaa tuulimyllyn ominaisuuksia"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2220
 msgid "Pipeline"
 msgstr "Putki"
@@ -16026,10 +16381,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 "Muokkaa putken ominaisuuksia"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2225
+#: build/trans_presets.java:2226
 msgid "Wastewater Plant"
 msgstr "Vedenpuhdistuslaitos"
@@ -16039,10 +16394,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 "Muokkaa vedenpuhdistuslaitoksen ominaisuuksia"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2233
+#: build/trans_presets.java:2234
 msgid "Crane"
 msgstr "Nosturi"
@@ -16050,10 +16405,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 "Muokkaa nosturin ominaisuuksia"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2239
+#: build/trans_presets.java:2240
 msgid "Beacon"
 msgstr "Loisto"
@@ -16061,10 +16416,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 ""
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2245
+#: build/trans_presets.java:2246
 msgid "Survey Point"
 msgstr ""
@@ -16072,10 +16427,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 ""
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2252
 msgid "Surveillance"
 msgstr "Valvontakamera"
@@ -16083,5 +16438,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 "Muokkaa valvontakameran ominaisuuksia"
@@ -16089,5 +16444,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2258
+#: build/trans_presets.java:2259
 msgid "Power Generator"
 msgstr ""
@@ -16097,39 +16452,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 ""
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "wind"
 msgstr "tuuli"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "hydro"
 msgstr "vesivoima"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "fossil"
 msgstr "fossiilinen polttoaine"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "nuclear"
 msgstr "ydinvoima"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "coal"
 msgstr "kivihiili"
 
-#: 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 "kaasu"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2268
 msgid "Power Station"
 msgstr ""
@@ -16138,10 +16493,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 ""
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2274
+#: build/trans_presets.java:2275
 msgid "Power Sub Station"
 msgstr "Muuntamoasema"
@@ -16150,5 +16505,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 "Muokkaa muuntamoaseman ominaisuuksia"
@@ -16156,10 +16511,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 "Korkeajännitelinjan torni"
@@ -16170,5 +16525,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 "Muokkaa korkeajännitelinjan tornin ominaisuuksia"
@@ -16176,5 +16531,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 "Sähkölinja"
@@ -16183,25 +16538,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 "Muokkaa sähkölinjan ominaisuuksia"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2298
 msgid "Voltage"
 msgstr "Jännite"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2299
 msgid "Amount of Wires"
 msgstr "Johtojen määrä"
 
 #. 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 "Käymälä"
@@ -16209,20 +16564,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 ""
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2312
 msgid "Post Box"
 msgstr "Postilaatikko"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2317
 msgid "Telephone"
 msgstr "Puhelin"
@@ -16231,5 +16586,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 "Muokkaa puhelimen ominaisuuksia"
@@ -16237,5 +16592,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 "Kolikot"
@@ -16243,5 +16598,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 ""
@@ -16249,5 +16604,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 ""
@@ -16255,5 +16610,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 ""
@@ -16261,15 +16616,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 "Luottokortit"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2328
 msgid "Telephone cards"
 msgstr "Puhelinkortit"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2330
 msgid "Recycling"
 msgstr "Kierrätys"
@@ -16278,5 +16633,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 "Muokkaa kierrätyspisteen ominaisuuksia"
@@ -16284,35 +16639,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 "Paristot"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2336
 msgid "Cans"
 msgstr "Peltitölkit"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2337
 msgid "Clothes"
 msgstr "Vaatteet"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2338
 msgid "Glass"
 msgstr "Lasi"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2339
 msgid "Paper"
 msgstr "Paperi"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2340
 msgid "Scrap Metal"
 msgstr "Romumetalli"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2342
 msgid "Bench"
 msgstr "Penkki"
@@ -16321,20 +16676,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 "Metsästyslava"
 
 #. item
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2347
 msgid "Edit Hunting Stand"
 msgstr "Muokkaa metsästyslavan ominaisuuksia"
 
 #. item "Amenities/Hunting Stand" check "Shelter"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2350
 msgid "Hide"
 msgstr ""
 
 #. item "Amenities/Hunting Stand" check "Hide"
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2351
 msgid "Lock"
 msgstr ""
@@ -16342,22 +16697,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 "Korkeus"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2351
+#: build/trans_presets.java:2352
 msgid "low"
 msgstr ""
 
-#: build/trans_presets.java:2351
+#: build/trans_presets.java:2352
 msgid "half"
 msgstr ""
 
-#: build/trans_presets.java:2351
+#: build/trans_presets.java:2352
 msgid "full"
 msgstr "täysi"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2354
 msgid "Fountain"
 msgstr "Lähde"
@@ -16366,10 +16721,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 "Muokkaa lähteen ominaisuuksia"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2361
 msgid "Drinking Water"
 msgstr "Juomavesi"
@@ -16378,10 +16733,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 "Muokkaa juomaveden ominaisuuksia"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2367
+#: build/trans_presets.java:2368
 msgid "Baby Hatch"
 msgstr ""
@@ -16389,25 +16744,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 "Kaupat"
 
 #. group "Shops"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2377
 msgid "Supermarket"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2378
 msgid "Edit Supermarket"
 msgstr ""
 
 #. item "Shops/Supermarket" text "Name"
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:2382
 msgid "Convenience Store"
 msgstr "Lähikauppa"
@@ -16415,10 +16770,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 "Muokkaa lähikaupan tietoja"
 
 #. item "Shops/Convenience Store" text "Name"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2388
 msgid "Kiosk"
 msgstr "Kioski"
@@ -16426,10 +16781,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 "Muokkaa kioskin ominaisuuksia"
 
 #. item "Shops/Kiosk" text "Name"
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2394
 msgid "Vending machine"
 msgstr "Automaatti"
@@ -16437,5 +16792,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 "Muokkaa automaatin tietoja"
@@ -16443,88 +16798,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 "Automaatin tuotteet"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "public_transport_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "public_transport_plans"
 msgstr ""
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "parking_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "food"
 msgstr ""
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "drinks"
 msgstr "juomat"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "sweets"
 msgstr ""
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "cigarettes"
 msgstr ""
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "photos"
 msgstr ""
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "animal_food"
 msgstr ""
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "news_papers"
 msgstr ""
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "toys"
 msgstr ""
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "stamps"
 msgstr ""
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "SIM-cards"
 msgstr ""
 
-#: 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 ""
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "tampons"
 msgstr ""
 
-#: 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 "Lihakauppa"
@@ -16532,10 +16887,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 "Muokkaa lihakaupan ominaisuuksia"
 
 #. item "Shops/Butcher" text "Name"
-#: build/trans_presets.java:2414
+#: build/trans_presets.java:2415
 msgid "Baker"
 msgstr "Leipomo"
@@ -16543,10 +16898,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 "Muokkaa leipomon ominaisuuksia"
 
 #. item "Shops/Baker" text "Name"
-#: build/trans_presets.java:2420
+#: build/trans_presets.java:2421
 msgid "Florist"
 msgstr ""
@@ -16554,20 +16909,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 ""
 
 #. 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 ""
@@ -16575,60 +16930,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 ""
 
 #. 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 ""
 
 #. item
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2444
 msgid "Edit Computer Shop"
 msgstr ""
 
 #. item "Shops/Computer" text "Name"
-#: build/trans_presets.java:2447
+#: build/trans_presets.java:2448
 msgid "Electronics"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2448
+#: build/trans_presets.java:2449
 msgid "Edit Electronics Shop"
 msgstr ""
 
 #. 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 ""
 
 #. item
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2459
 msgid "Edit Furniture Shop"
 msgstr ""
 
 #. item "Shops/Furniture" text "Name"
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2463
 msgid "Garden Centre"
 msgstr ""
@@ -16636,10 +16991,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 ""
 
 #. item "Shops/Garden Centre" text "Name"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2469
 msgid "Hardware"
 msgstr ""
@@ -16647,10 +17002,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 ""
 
 #. item "Shops/Hardware" text "Name"
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2475
 msgid "Do-it-yourself-store"
 msgstr "Tee-se-itse-kauppa"
@@ -16658,60 +17013,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 "Muokkaa tee-se-itse-kaupan ominaisuuksia"
 
 #. item "Shops/Do-it-yourself-store" text "Name"
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2481
 msgid "Stationery"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2482
 msgid "Edit Stationery Shop"
 msgstr ""
 
 #. item "Shops/Stationery" text "Name"
-#: build/trans_presets.java:2485
+#: build/trans_presets.java:2486
 msgid "Hairdresser"
 msgstr "Kampaamo"
 
 #. item
-#: build/trans_presets.java:2486
+#: build/trans_presets.java:2487
 msgid "Edit Hairdresser"
 msgstr "Muokkaa kampaamon ominaisuuksia"
 
 #. item "Shops/Hairdresser" text "Name"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2491
 msgid "Shoes"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2492
 msgid "Edit Shoe Shop"
 msgstr ""
 
 #. item "Shops/Shoes" text "Name"
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2496
 msgid "Toys"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2497
 msgid "Edit Toy Shop"
 msgstr ""
 
 #. item "Shops/Toys" text "Name"
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2501
 msgid "Video"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2502
 msgid "Edit Video Shop"
 msgstr ""
 
 #. item "Shops/Video" text "Name"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2506
 msgid "Dry Cleaning"
 msgstr "Kuivapesula"
@@ -16719,10 +17074,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 "Muokkaa kuivapesulan ominaisuuksia"
 
 #. item "Shops/Dry Cleaning" text "Name"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2512
 msgid "Laundry"
 msgstr "Pesula"
@@ -16730,10 +17085,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 "Muokkaa pesulan ominaisuuksia"
 
 #. item "Shops/Laundry" text "Name"
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2518
 msgid "Outdoor"
 msgstr ""
@@ -16741,35 +17096,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 ""
 
 #. item "Shops/Outdoor" text "Name"
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2524
 msgid "Sports"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2525
 msgid "Edit Sports Shop"
 msgstr ""
 
 #. item "Shops/Sports" text "Name"
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2529
 msgid "Optician"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2530
 msgid "Edit Optician"
 msgstr "Muokkaa optikon ominaisuuksia"
 
 #. item "Shops/Optician" text "Name"
-#: build/trans_presets.java:2535
+#: build/trans_presets.java:2536
 msgid "Cash"
 msgstr "Raha"
 
 #. group "Cash"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2537
 msgid "Bank"
 msgstr "Pankki"
@@ -16777,5 +17132,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 "Muokkaa pankin ominaisuuksia"
@@ -16783,10 +17138,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 "Pankkiautomaatti"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2544
 msgid "Money Exchange"
 msgstr "Rahanvaihto"
@@ -16794,5 +17149,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 "Muokkaa rahanvaihdon ominaisuuksia"
@@ -16800,15 +17155,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 "Muokkaa pankkiautomaatin ominaisuuksia"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2557
 msgid "Health"
 msgstr "Terveys"
 
 #. group "Health"
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2558
 msgid "Doctors"
 msgstr "Lääkäri"
@@ -16816,20 +17171,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 "Muokkaa lääkärin ominaisuuksia"
 
 #. item "Health/Doctors" text "Name"
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2564
 msgid "Dentist"
 msgstr "Hammaslääkäri"
 
 #. item
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2565
 msgid "Edit Dentist"
 msgstr "Muokkaa hammaslääkärin ominaisuuksia"
 
 #. item "Health/Dentist" text "Name"
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2569
 msgid "Pharmacy"
 msgstr "Apteekki"
@@ -16837,5 +17192,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 "Muokkaa apteekin ominaisuuksia"
@@ -16843,10 +17198,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 ""
 
 #. item "Health/Pharmacy" text "Name"
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2576
 msgid "Hospital"
 msgstr "Sairaala"
@@ -16854,10 +17209,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 "Muokkaa sairaalan ominaisuuksia"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2582
 msgid "Emergency Access Point"
 msgstr ""
@@ -16866,5 +17221,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 ""
@@ -16873,20 +17228,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2588
 msgid "Point Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2589
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2591
 msgid "Phone Number"
 msgstr "Puhelinnumero"
 
 #. 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 ""
@@ -16894,5 +17249,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 "Eläinlääkäri"
@@ -16901,25 +17256,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 "Muokkaa eläinlääkärin ominaisuuksia"
 
 #. group "Places"
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2605
 msgid "Continent"
 msgstr "Maanosa"
 
 #. item
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2606
 msgid "Edit Continent"
 msgstr "Muokkaa maanosan ominaisuuksia"
 
 #. 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 "Muokkaa maan ominaisuuksia"
@@ -16927,30 +17282,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 "Osavaltio"
 
 #. item
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2618
 msgid "Edit State"
 msgstr "Muokkaa osavaltion ominaisuuksia"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2622
+#: build/trans_presets.java:2623
 msgid "Region"
 msgstr "Seutu"
 
 #. item
-#: build/trans_presets.java:2623
+#: build/trans_presets.java:2624
 msgid "Edit Region"
 msgstr ""
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2628
+#: build/trans_presets.java:2629
 msgid "County"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2629
+#: build/trans_presets.java:2630
 msgid "Edit County"
 msgstr ""
@@ -16958,15 +17313,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2635
+#: build/trans_presets.java:2636
 msgid "City"
 msgstr "Iso kaupunki"
 
 #. item
-#: build/trans_presets.java:2636
+#: build/trans_presets.java:2637
 msgid "Edit City"
 msgstr "Muokkaa kaupungin ominaisuuksia"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2641
+#: build/trans_presets.java:2642
 msgid "Town"
 msgstr "Kaupunki"
@@ -16974,10 +17329,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 "Muokkaa kaupungin ominaisuuksia"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2649
 msgid "Suburb"
 msgstr "Kaupunginosa"
@@ -16985,25 +17340,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 "Muokkaa kaupunginosan ominaisuuksia"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2656
 msgid "Village"
 msgstr "Kunta"
 
 #. item
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2657
 msgid "Edit Village"
 msgstr "Muokkaa kunnan ominaisuuksia"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2662
 msgid "Hamlet"
 msgstr "Kylä"
 
 #. item
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2663
 msgid "Edit Hamlet"
 msgstr "Muokkaa kylän ominaisuuksia"
@@ -17011,5 +17366,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2669
 msgid "Locality"
 msgstr ""
@@ -17017,10 +17372,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 ""
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2676
 msgid "Island"
 msgstr "Saari"
@@ -17028,5 +17383,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 "Muokkaa saaren ominaisuuksia"
@@ -17034,5 +17389,5 @@
 #. item "Places/Island" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2683
+#: build/trans_presets.java:2684
 msgid "Cave Entrance"
 msgstr "Luolan suuaukko"
@@ -17040,10 +17395,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 "Muokkaa luolan suuaukon ominaisuuksia"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2690
 msgid "Peak"
 msgstr "Huippu"
@@ -17051,10 +17406,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 "Muokkaa huipun ominaisuuksia"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2697
 msgid "Glacier"
 msgstr "Jäätikkö"
@@ -17062,10 +17417,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 "Muokkaa jäätikön ominaisuuksia"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2703
+#: build/trans_presets.java:2704
 msgid "Volcano"
 msgstr "Tulivuori"
@@ -17073,70 +17428,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 "Muokkaa tulivuoren ominaisuuksia"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2711
+#: build/trans_presets.java:2712
 msgid "Boundaries"
 msgstr "Rajat"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2713
 msgid "National"
 msgstr "Kansallinen"
 
 #. item
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2714
 msgid "Edit National Boundary"
 msgstr "Muokkaa kansallisen rajan ominaisuuksia"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2718
+#: build/trans_presets.java:2719
 msgid "Administrative"
 msgstr "Hallinnollinen"
 
 #. item
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2720
 msgid "Edit Administrative Boundary"
 msgstr "Muokkaa hallinnollisen rajan ominaisuuksia"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2724
+#: build/trans_presets.java:2725
 msgid "Civil"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2725
+#: build/trans_presets.java:2726
 msgid "Edit Civil Boundary"
 msgstr ""
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2730
+#: build/trans_presets.java:2731
 msgid "Political"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:2732
 msgid "Edit Political Boundary"
 msgstr "Muokkaa poliittisen rajan ominaisuuksia"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2736
+#: build/trans_presets.java:2737
 msgid "National park"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2737
+#: build/trans_presets.java:2738
 msgid "Edit National Park Boundary"
 msgstr "Muokkaa kansallispuiston rajan ominaisuuksia"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2744
 msgid "Land use"
 msgstr "Maankäyttö"
 
 #. group "Land use"
-#: build/trans_presets.java:2744
+#: build/trans_presets.java:2745
 msgid "Tree"
 msgstr "Puu"
@@ -17145,15 +17500,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 "Muokkaa puun ominaisuuksia"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2753
 msgid "Botanical Name"
 msgstr "Kasvitieteellinen nimi"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2755
 msgid "Wood"
 msgstr "Metsä"
@@ -17162,5 +17517,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 "Muokkaa metsän ominaisuuksia"
@@ -17168,17 +17523,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 "havumetsä"
 
-#: build/trans_presets.java:2760 build/trans_presets.java:2769
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
 msgid "deciduous"
 msgstr "lehtimetsä"
 
-#: build/trans_presets.java:2760 build/trans_presets.java:2769
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
 msgid "mixed"
 msgstr "sekametsä"
 
-#: build/trans_presets.java:2762
+#: build/trans_presets.java:2763
 msgid "Forest"
 msgstr "Talousmetsä"
@@ -17187,14 +17542,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 "Muokkaa talousmetsän ominaisuuksia"
 
-#: build/trans_presets.java:2771
+#: build/trans_presets.java:2772
 msgid "Nature Reserve"
 msgstr "Luonnonsuojelualue"
 
 #. item
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2773
 msgid "Edit Nature Reserve"
 msgstr ""
@@ -17202,25 +17557,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2777
+#: build/trans_presets.java:2778
 msgid "Scree"
 msgstr "kivikko, rakka"
 
 #. item
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:2779
 msgid "Edit Scree"
 msgstr "Muokkaa kivikon ominaisuuksia"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2783
 msgid "Scrub"
 msgstr "Pusikko"
 
 #. item
-#: build/trans_presets.java:2783
+#: build/trans_presets.java:2784
 msgid "Edit Scrub"
 msgstr "Muokkaa pusikon ominaisuuksia"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2788
 msgid "Fell"
 msgstr "Tunturi"
@@ -17228,10 +17583,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 "Muokkaa tunturin ominaisuuksia"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2794
 msgid "Heath"
 msgstr "Nummi"
@@ -17239,5 +17594,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 "Muokkaa nummen ominaisuuksia"
@@ -17245,5 +17600,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2801
 msgid "Farmyard"
 msgstr "Maatilan piha/työskentelyalue (muu kuin pelto)"
@@ -17252,45 +17607,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 "Muokkaa maatilan pihan ominaisuuksia"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2808
+#: build/trans_presets.java:2809
 msgid "Farmland"
 msgstr "Peltoalueet"
 
 #. item
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2810
 msgid "Edit Farmland Landuse"
 msgstr ""
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2814
+#: build/trans_presets.java:2815
 msgid "Meadow"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2816
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2820
+#: build/trans_presets.java:2821
 msgid "Vineyard"
 msgstr "Viinitarha"
 
 #. item
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2822
 msgid "Edit Vineyard Landuse"
 msgstr "Muokkaa viinitarhan ominaisuuksia"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2826
+#: build/trans_presets.java:2827
 msgid "Allotments"
 msgstr "Siirtolapuutarha"
 
 #. item
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:2828
 msgid "Edit Allotments Landuse"
 msgstr "Muokkaa siirtolapuutarhan ominaisuuksia"
@@ -17298,25 +17653,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2833
+#: build/trans_presets.java:2834
 msgid "Garden"
 msgstr "Puutarha"
 
 #. item
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2835
 msgid "Edit Garden"
 msgstr ""
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2838
+#: build/trans_presets.java:2839
 msgid "Grass"
 msgstr "Ruoho"
 
 #. item
-#: build/trans_presets.java:2839
+#: build/trans_presets.java:2840
 msgid "Edit Grass Landuse"
 msgstr "Muokkaa ruohon ominaisuuksia"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2845
 msgid "Village Green"
 msgstr ""
@@ -17324,10 +17679,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 ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:2852
 msgid "Common"
 msgstr ""
@@ -17335,20 +17690,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 ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2858
 msgid "Park"
 msgstr "Puisto"
 
 #. item
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:2859
 msgid "Edit Park"
 msgstr "Muokkaa puiston ominaisuuksia"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2863
 msgid "Recreation Ground"
 msgstr ""
@@ -17356,5 +17711,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 ""
@@ -17362,15 +17717,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2871
 msgid "Residential area"
 msgstr "Asuinalue"
 
 #. item
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2872
 msgid "Edit Residential Landuse"
 msgstr "Muokkaa asuinalueen ominaisuuksia"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2877
 msgid "Graveyard"
 msgstr "Hautausmaa (pieni)"
@@ -17378,9 +17733,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 "Muokkaa pienen hautausmaan ominaisuuksia"
 
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:2885
 msgid "Cemetery"
 msgstr "Hautausmaa"
@@ -17388,39 +17743,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 "Muokkaa hautausmaan ominaisuuksia"
 
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2894
 msgid "Retail"
 msgstr "Kaupallinen"
 
 #. item
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2895
 msgid "Edit Retail Landuse"
 msgstr "Muokkaa kaupallisen alueen ominaisuuksia"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2900
 msgid "Commercial"
 msgstr "Toimistoalue"
 
 #. item
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2901
 msgid "Edit Commercial Landuse"
 msgstr "Muokkaa toimistoalueen ominaisuuksia"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2906
 msgid "Industrial"
 msgstr "Teollisuusalue"
 
 #. item
-#: build/trans_presets.java:2906
+#: build/trans_presets.java:2907
 msgid "Edit Industrial Landuse"
 msgstr "Muokkaa teollisuusalueen ominaisuuksia"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2912
 msgid "Railway land"
 msgstr "Rata-alue"
@@ -17428,15 +17783,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 "Muokkaa rata-alueen ominaisuuksia"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:2919
 msgid "Military"
 msgstr "Sotilasvoimat"
 
 #. item
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2920
 msgid "Edit Military Landuse"
 msgstr "Muokkaa sotilasvoimien maa-alueen ominaisuuksia"
@@ -17444,55 +17799,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2925
+#: build/trans_presets.java:2926
 msgid "Construction area"
 msgstr "Rakennustyömaa"
 
 #. item
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2927
 msgid "Edit Construction Landuse"
 msgstr "Muokkaa rakennustyömaan ominaisuuksia"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2932
 msgid "Brownfield"
 msgstr "Purettuja rakennuksia"
 
 #. item
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:2933
 msgid "Edit Brownfield Landuse"
 msgstr "Muokkaa purettujen rakennusten alueen ominaisuuksia"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2937
+#: build/trans_presets.java:2938
 msgid "Greenfield"
 msgstr "Rakentamiselle raivattu alue"
 
 #. item
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:2939
 msgid "Edit Greenfield Landuse"
 msgstr "Muokkaa rakentamiselle raivatun alueen ominaisuuksia"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:2944
 msgid "Landfill"
 msgstr "Kaatopaikka"
 
 #. item
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:2945
 msgid "Edit Landfill Landuse"
 msgstr "Muokkaa kaatopaikan ominaisuuksia"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2950
 msgid "Quarry"
 msgstr "Louhos"
 
 #. item
-#: build/trans_presets.java:2950
+#: build/trans_presets.java:2951
 msgid "Edit Quarry Landuse"
 msgstr "Muokkaa louhoksen ominaisuuksia"
 
 #. group "Relations"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2960
 msgid "Multipolygon"
 msgstr ""
@@ -17502,5 +17857,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 ""
@@ -17509,10 +17864,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:2970
 msgid "outer segment"
 msgstr ""
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:2970
+#: build/trans_presets.java:2971
 msgid "inner segment"
 msgstr ""
@@ -17520,5 +17875,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:2974
 msgid "Turn restriction"
 msgstr ""
@@ -17527,5 +17882,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 ""
@@ -17533,34 +17888,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 "Kielto"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_straight_on"
 msgstr ""
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_u_turn"
 msgstr ""
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "only_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "only_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "only_straight_on"
 msgstr ""
@@ -17569,15 +17924,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2983
+#: build/trans_presets.java:2984
 msgid "from way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2985
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2986
 msgid "to way"
 msgstr ""
@@ -17585,5 +17940,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:2988
+#: build/trans_presets.java:2989
 msgid "Route"
 msgstr ""
@@ -17592,5 +17947,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 ""
@@ -17598,5 +17953,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 ""
@@ -17668,5 +18023,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
@@ -17675,17 +18030,17 @@
 msgstr "polkupyörä"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "bus"
 msgstr ""
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "ski"
 msgstr ""
@@ -17738,5 +18093,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
@@ -17745,13 +18100,13 @@
 msgstr ""
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "hiking"
 msgstr ""
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "detour"
 msgstr ""
@@ -17765,10 +18120,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 "metro"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:2997
 msgid "Symbol description"
 msgstr ""
@@ -17776,26 +18131,26 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:2999
+#: build/trans_presets.java:3000
 msgid "Network"
 msgstr ""
 
 #. item "Relations/Route" combo "State"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3003
 msgid "Color (hex)"
 msgstr ""
@@ -17804,30 +18159,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:3006
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3007
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3008
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3009
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3010
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3011
 msgid "backward halt point"
 msgstr ""
@@ -21942,7 +22297,21 @@
 msgstr ""
 
+#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
+#~ msgstr ""
+#~ "Voit käyttää hiirtä tai Ctrl+nuolinäppäimet lähentääksesi/loitontaaksesi "
+#~ "ja siirtääksesi näkymää."
+
 #~ msgid "Uploading data"
 #~ msgstr "Lähetetään dataa"
 
+#~ msgid "Email"
+#~ msgstr "Sähköpostiosoite"
+
+#~ msgid "Login name (email) to the OSM account."
+#~ msgstr "OSM-tilin kirjautumisnimi (sähköpostiosoite)."
+
+#~ msgid "OSM username (email)"
+#~ msgstr "OSM-käyttäjänimi (sähköpostiosoite)"
+
 #~ msgid "Unknown host"
 #~ msgstr "Tuntematon palvelin"
@@ -21950,4 +22319,11 @@
 #~ msgid "Add either site-josm.xml or Wiki Pages."
 #~ msgstr "Lisää joko site-josm.xml tai Wiki-sivusto."
+
+#~ msgid ""
+#~ "Server returned internal error. Try a reduced area or retry after waiting "
+#~ "some time."
+#~ msgstr ""
+#~ "Palvelin palautti sisäisen virheen. Kokeile ladata pienempi alue tai "
+#~ "yritä myöhemmin uudestaan."
 
 #~ msgid "Commit comment"
@@ -21999,4 +22375,14 @@
 #~ msgid "Really mark this issue as ''done''?"
 #~ msgstr "Merkataanko tämä ongelma todella \"valmiiksi\"?"
+
+#~ 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 URL.<br><b>Do not use a valuable Password.</b></html>"
+#~ msgstr ""
+#~ "<html>VAROITUS: Salasana on tallennettu asetustiedostoon ilman "
+#~ "minkäänlaista salausta.<br>Salasana lähetetään salaamattomana "
+#~ "palvelimelle URL-osoitteessa.</br><b>Älä käytä arvokasta salasanaa.</b></"
+#~ "html>"
 
 #~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS"
@@ -22024,4 +22410,14 @@
 #~ "{0}"
 
+#~ msgid "Open the OpenStreetBugs window and activate the automatic download"
+#~ msgstr "Avaa OpenStreetBugs-ikkuna ja aktivoi automaattinen lataus"
+
+#~ msgid ""
+#~ "This action will require {0} individual download requests. Do you wish to "
+#~ "continue?"
+#~ msgstr ""
+#~ "Tämä toiminto vaatii {0} erillistä latauspyyntyöä. Oletko varma, että "
+#~ "haluat jatkaa?"
+
 #~ msgid "Edit Drawbridge"
 #~ msgstr "Muokkaa laskusillan ominaisuuksia"
Index: applications/editors/josm/i18n/po/fr.po
===================================================================
--- applications/editors/josm/i18n/po/fr.po	(revision 16008)
+++ applications/editors/josm/i18n/po/fr.po	(revision 16009)
@@ -6,7 +6,7 @@
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-14 16:51+0200\n"
-"PO-Revision-Date: 2009-06-09 17:52+0000\n"
-"Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
+"POT-Creation-Date: 2009-06-19 21:52+0200\n"
+"PO-Revision-Date: 2009-06-17 15:04+0000\n"
+"Last-Translator: nin2jardin <Unknown>\n"
 "Language-Team: Fr\n"
 "MIME-Version: 1.0\n"
@@ -14,5 +14,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2009-06-14 14:45+0000\n"
+"X-Launchpad-Export-Date: 2009-06-19 19:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -25,13 +25,13 @@
 #: ../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 "Aide"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:261
-msgid "The projection could not be read from preferences. Using Mercartor"
-msgstr ""
-"La projection ne peut être lue dans les préférences. Mercartor sera utilisé."
+msgid "The projection could not be read from preferences. Using Mercator"
+msgstr ""
+"La projection ne peut être lue dans les préférences. Mercator sera utilisé."
 
 #: ../core/src/org/openstreetmap/josm/Main.java:349
@@ -73,6 +73,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
@@ -89,8 +91,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
@@ -139,5 +141,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"
@@ -541,5 +543,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}"
@@ -611,6 +613,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:92
-msgid "Email"
-msgstr "E-mail"
+msgid "E-Mail"
+msgstr "E-Mail"
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:96
@@ -648,12 +650,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
@@ -680,5 +684,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
@@ -712,15 +716,15 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:207
 #, java-format
-msgid "Helppage missing. Create it in <A HREF=\"{0}\">english</A>."
-msgstr "Page d’aide manquante. Créez la sur <A HREF=\"{0}\">english</A>."
+msgid "Help page missing. Create it in <A HREF=\"{0}\">english</A>."
+msgstr "Page d’aide manquante. Créez-la en <A HREF=\"{0}\">français</A>."
 
 #: ../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 ""
-"Page d’aide manquante. Créez la sur <A HREF=\"{0}\">english</A> ou <A HREF="
-"\"{1}\">french</A>."
+"Page d’aide manquante. Créez-la en <A HREF=\"{0}\">français</A> ou <A HREF="
+"\"{1}\">votre langage</A>."
 
 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:26
@@ -1159,13 +1163,13 @@
 msgstr "Aide : {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:99
 msgid "Status Report"
 msgstr "Rapport d'état"
 
-#: ../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 "Copier vers le presse-papier et fermer"
 
-#: ../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
@@ -1365,12 +1369,10 @@
 msgstr "Désélectionner tout (Echap)"
 
-#: ../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 "Mettre à jour les données"
 
-#: ../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 ""
@@ -1378,5 +1380,5 @@
 "les données)"
 
-#: ../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?"
@@ -1385,89 +1387,274 @@
 "couche de données ?"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:70
+msgid "Undeleting Way..."
+msgstr "Restauration du chemin..."
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:133
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:247
+msgid "Yes, undelete them too"
+msgstr "Oui, les restaurer également"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:248
+msgid "No, cancel operation"
+msgstr "Non, annuler l’opération"
+
+#: ../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 ""
-"Cette action va nécessiter {0} requêtes de téléchargement. Souhaitez-vous "
-"continuer ?"
-
-#: ../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 ""
+"<html>Il y a {0} nœuds additionnels faisant partie du chemin {1}<br>qui sont "
+"supprimés du serveur.<br><br>Voulez-vous les restaurer également ?</html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:143
+msgid "Undelete additional nodes?"
+msgstr "Restaurer ces nœuds également ?"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:170
+#, java-format
+msgid "Checking whether node {0} is gone ..."
+msgstr "Vérification si le nœud {0} est supprimé..."
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:203
+msgid "Undeleting relation..."
+msgstr "Restauration de la relation..."
+
+#: ../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 ""
+"<html>Il y a {0} primitives référencées dans la relation {1}<br>qui sont "
+"supprimées sur le serveur.<br><br>Voulez-vous les restaurer également ?</"
+"html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:257
+msgid "Undelete dependent primitives?"
+msgstr "Restaurer les primitives ?"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:284
+#, java-format
+msgid "Checking whether primitive {0} is gone ..."
+msgstr "Vérification si la primitive {0} est supprimée..."
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:339
+msgid "Keep mine"
+msgstr "Conserver ma version"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:340
+msgid "Delete mine"
+msgstr "Supprimer ma version"
+
+#: ../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 ""
+"<html>La primitive OSM d’id <strong>{0}</strong> a été supprimée<br>sur le "
+"serveur par un autre utilisateur.<br><br>Cliquez <strong>{1}</strong> pour "
+"garder votre primitive et ignorer l’état supprimé.<br>Votre primitive "
+"obtiendra un nouvel id.<br>Cliquez <strong>{2}</strong> pour accepter l’état "
+"du serveur et supprimer votre primitive.<br>Cliquez <strong>{3}</strong> "
+"pour annuler.<br>"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:356
+msgid "Primitive deleted on the server"
+msgstr "Primitive supprimée du serveur"
+
+#. 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 "valeur inattendue retournée. Reçue {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:395
+msgid "Failed to update the selected primitives."
+msgstr "Échec de la mise à jour des primitives sélectionnées."
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:396
+msgid "Update failed"
+msgstr "La mise à jour a échoué"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:408
+#, java-format
+msgid "Could not find primitive with id {0} in the current dataset"
+msgstr ""
+"Impossible de trouver la primitive d’id {0} dans le jeu de données courant"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:409
+msgid "Missing primitive"
+msgstr "Primitive manquante"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:441
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:445
+msgid "Update Selection"
+msgstr "Mettre à jour la sélection"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:443
+msgid "Updates the currently selected primitives from the server"
+msgstr "Met à jour la sélection de primitive depuis le serveur"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:457
+msgid "There are no selected primitives to update."
+msgstr "Il n'y a pas de primitive sélectionnée à mettre à jour."
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:458
+msgid "Selection empty"
+msgstr "La sélection est vide"
+
+#: ../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 ""
+"<html>Il y a <strong>{0}</strong> primitives <br>sélectionnées pour mise à "
+"jour. Veuillez réduire la sélection<br>à un maximum de {1} primitives.</html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:476
+msgid "Selection too big"
+msgstr "La sélection est trop large"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
 msgid "Upload to OSM..."
 msgstr "Chargement vers OSM..."
 
-#: ../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 "Envoyer tous les changements sur le serveur OSM."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:96
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:94
 msgid "Objects to add:"
 msgstr "Objets à ajouter :"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102
 msgid "Objects to modify:"
 msgstr "Objets à modifier :"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:110
 msgid "Objects to delete:"
 msgstr "Objets à supprimer :"
 
-#: ../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 "Fournissez un bref commentaire aux changements que vous envoyez :"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:126
 msgid "Upload these changes?"
 msgstr "Charger ces changements ?"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:130
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
 msgid "Upload Changes"
 msgstr "Envoyer les changements"
 
-#: ../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 "Rien à envoyer. Obtenez d’abord des données."
 
-#: ../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 ""
 "Certains conflits ne sont pas résolus. Vous devez d’abord les résoudre."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:182
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:180
 msgid "No changes to upload."
 msgstr "Aucun changement à envoyer."
 
-#: ../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
+msgstr "Téléchargement"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
+msgid "Updating primitive"
+msgstr "Mise à jour des primitives"
+
+#: ../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 "Synchroniser tout le jeu de données"
+
+#: ../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 "Conflit détecté"
+
+#: ../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 ""
+"Attention : erreur d’en-tête \"{0}\" ne correspond pas à la forme \"{1}\""
+
+#: ../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 "Primitive déjà supprimée"
+
+#: ../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
+msgstr "L’envoi vers l’API OSM a échoué"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:552
 #, java-format
 msgid ""
@@ -1575,37 +1762,51 @@
 msgstr "Données GPS brutes"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:44
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:46
 msgid "Downloading data"
 msgstr "Téléchargement des données"
 
-#: ../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 "Aucune donnée importée"
 
-#: ../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 "Couche de données {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 "Données OpenStreetMap"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:37
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:45
 msgid "Data Layer"
 msgstr "Calque de données"
 
-#: ../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 "Téléchargement de {0} de {1} ({2} restant(s))"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:88
-msgid "The following errors occured during mass download:"
-msgstr "Les erreurs suivantes sont survenues durant le téléchargement groupé :"
-
-#: ../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 "Les erreurs suivantes sont survenues durant le transfert :"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:96
 msgid "Errors during Download"
 msgstr "Erreurs durant le téléchargement"
+
+#: ../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 "Primitives supprimées ou déplacées"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:45
@@ -1659,34 +1860,34 @@
 msgstr "Impossible d'ajouter un nœud en dehors du monde"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:495
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:493
 msgid "Add node"
 msgstr "Ajouter un nœud"
 
-#: ../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 "Ajouter un nœud au chemin."
 
-#: ../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 "Connecter le chemin existant au nœud"
 
-#: ../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 "Ajouter un nœud à un chemin existant."
 
-#: ../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 "Ajouter un nœud sur le chemin et le connecter"
 
-#: ../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 "Créer un nouveau nœud."
 
-#: ../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 "Sélectionner le nœud sous le curseur."
 
-#: ../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."
@@ -1695,14 +1896,14 @@
 msgstr[1] "Ajouter un nouveau nœud aux {0} chemins."
 
-#: ../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 "Commencer un nouveau chemin à partir du dernier nœud."
 
-#: ../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 "Continuer le chemin à partir du dernier nœud."
 
-#: ../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 "Terminer le tracé."
@@ -2046,26 +2247,32 @@
 msgstr "Valeur inorrecte de l’opération sur id : {0}. Un nombre est attendu."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:33
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:34
 msgid "Load Selection"
 msgstr "Charger la sélection"
 
-#: ../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 "Contact de {0}..."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:45
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:46
 msgid "Downloading..."
 msgstr "Téléchargement..."
 
-#: ../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 "Impossible de lire quelque chose depuis l’URL : \"{0}\""
 
-#: ../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 "Erreur d’analyse dans l’URL : \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:74
+msgid "Error while communicating with server."
+msgstr "Erreur de communication avec le serveur"
 
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67
@@ -2126,13 +2333,85 @@
 msgstr "Résoudre {0} conflits dans {1} objets"
 
-#: ../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 "Résoudre les conflits de coordonnées dans {0}"
+
+#. 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 "impossible de résoudre un conflit non arbitré"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81
+#, java-format
+msgid "Delete {1} {0}"
+msgstr "Supprimer {1} {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97
+#, java-format
+msgid "Delete {0} {1}"
+msgstr "Supprimer {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153
+msgid "Conflicting relation"
+msgstr "Relation conflictuelle"
+
+#: ../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 ""
+"Sélection \"{0}\" est utilisé par la relation \"{1}\" avec le role {2}.\n"
+"Supprimer de la relation ?"
+
+#: ../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 "Supprimer de la relation"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
+#, java-format
+msgid ""
+"Selection \"{0}\" is used by relation \"{1}\".\n"
+"Delete from relation?"
+msgstr ""
+"La sélection \"{0}\" est utilisée par la relation \"{1}\".\n"
+"Supprimer de la relation ?"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:366
+msgid "Split way segment"
+msgstr "Séparer le segment du chemin"
+
+#. 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 ""
+"Vous êtes sur le point de supprimer des nœuds en dehors de la zone "
+"téléchargée. <br>Cela peut poser problème car d'autres objets (que vous ne "
+"voyez pas) pourraient les utiliser.<br>Voulez-vous vraiment les supprimer ?"
+
+#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:53
+#, java-format
+msgid "Resolve conflicts in deleted state in {0}"
+msgstr "Résoudre les conflits de suppression dans {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118
+msgid "Move"
+msgstr "Déplacer"
+
 #: ../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"
@@ -2141,10 +2420,221 @@
 msgstr[1] "nœuds"
 
-#: ../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 "RemoveRelationMember"
+
+#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
+msgid "Rotate"
+msgstr "Pivoter"
+
+#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88
+msgid "Sequence"
+msgstr "Séquence"
+
+#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:72
+#, java-format
+msgid "Resolve {0} tag conflicts in {1} {2}"
+msgstr "Résoudre {0} conflits d’étiquette dans {1} {2}"
+
+#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:61
+#, java-format
+msgid "Undelete {0} primitives"
+msgstr "Restaurer {0} primitives"
+
+#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:44
+#, java-format
+msgid "Resolve version conflicts for {0} {1}"
+msgstr "Résoudre les conflits de version de {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52
+#, java-format
+msgid "Resolve conflicts in node list of of way {0}"
+msgstr "Résoudre les conflits de la liste de noeuds du chemin {0}"
+
+#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
+msgid "Apply?"
+msgstr "Appliquer ?"
+
+#: ../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 ""
+"Les changements suivants aux propriétés du chemin sont suggérés après son "
+"retournement pour préserver la consistence des données."
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28
+msgid "Relation"
+msgstr "Relation"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30
+msgid "Old role"
+msgstr "Ancien rôle"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:32
+msgid "New role"
+msgstr "Nouveau rôle"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
+msgid "Old key"
+msgstr "Ancienne clé"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
+msgid "Old value"
+msgstr "Ancienne valeur"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
+msgid "New key"
+msgstr "Nouvelle clé"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
+msgid "New value"
+msgstr "Nouvelle valeur"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:40
+msgid "Apply selected changes"
+msgstr "Appliquer les changements sélectionnés"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41
+msgid "Don't apply changes"
+msgstr "Ne pas appliquer les changements"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:83
+msgid "Please select which property changes you want to apply."
+msgstr "Merci de sélectionner les changements que vous voulez appliquer"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:96
+msgid "Properties of "
+msgstr "Propriétés de "
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:120
+msgid "Roles in relations referring to"
+msgstr "Rôles de la relation de référence"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:136
+msgid "Automatic tag correction"
+msgstr "Correction automatique d’étiquette"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:314
+#, java-format
+msgid "Malformed config file at lines {0}"
+msgstr "Erreur dans le fichier de configuration aux lignes {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:324
+#, java-format
+msgid "Cannot open preferences directory: {0}"
+msgstr "Impossible d’ouvrir le répertoire des préférences : {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 ""
+"Le fichier des préférences contient des erreurs. Sauvegarde de l’ancien "
+"fichier dans {0}."
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:79
+#, java-format
+msgid "Preferences stored on {0}"
+msgstr "Préférences sauvegardées sur {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:82
+#, java-format
+msgid "Could not upload preferences. Reason: {0}"
+msgstr "Impossible de charger les préférences. Raison : {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:93
+msgid "Could not load preferences from server."
+msgstr "Impossible de charger les préférences depuis le serveur."
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:34
+msgid "different"
+msgstr "différent"
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:262
+msgid "deleted"
+msgstr "supprimé"
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
+msgid "true"
+msgstr "vrai"
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
+msgid "false"
+msgstr "faux"
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20
+msgid "position"
+msgstr "position"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30
+msgid "Decimal Degrees"
+msgstr "Degrés décimaux"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
+msgid "Degrees Minutes Seconds"
+msgstr "Degrés Minutes Secondes"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+msgid "S"
+msgstr "S"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+msgid "N"
+msgstr "N"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+msgid "W"
+msgstr "O"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+msgid "E"
+msgstr "E"
+
+#: ../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 "incomplet"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
+#, java-format
+msgid "Error: {0}"
+msgstr "Erreur : {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
+#, java-format
+msgid "Warning: {0}"
+msgstr "Attention : {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7
+msgid "nodes"
+msgstr "nœuds"
+
+#: ../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"
@@ -2153,8 +2643,10 @@
 msgstr[1] "voies"
 
-#: ../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 "chemins"
+
+#: ../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
@@ -2165,267 +2657,27 @@
 msgstr[1] "relations"
 
-#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:68
-#, java-format
-msgid "Resolve conflicts in coordinates in {0}"
-msgstr "Résoudre les conflits de coordonnées dans {0}"
-
-#. 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 "impossible de résoudre un conflit non arbitré"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81
-#, java-format
-msgid "Delete {1} {0}"
-msgstr "Supprimer {1} {0}"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97
-#, java-format
-msgid "Delete {0} {1}"
-msgstr "Supprimer {0} {1}"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153
-msgid "Conflicting relation"
-msgstr "Relation conflictuelle"
-
-#: ../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 ""
-"Sélection \"{0}\" est utilisé par la relation \"{1}\" avec le role {2}.\n"
-"Supprimer de la relation ?"
-
-#: ../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 "Supprimer de la relation"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
-#, java-format
-msgid ""
-"Selection \"{0}\" is used by relation \"{1}\".\n"
-"Delete from relation?"
-msgstr ""
-"La sélection \"{0}\" est utilisée par la relation \"{1}\".\n"
-"Supprimer de la relation ?"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:366
-msgid "Split way segment"
-msgstr "Séparer le segment du chemin"
-
-#. 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 ""
-"Vous êtes sur le point de supprimer des nœuds en dehors de la zone "
-"téléchargée. <br>Cela peut poser problème car d'autres objets (que vous ne "
-"voyez pas) pourraient les utiliser.<br>Voulez-vous vraiment les supprimer ?"
-
-#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:53
-#, java-format
-msgid "Resolve conflicts in deleted state in {0}"
-msgstr "Résoudre les conflits de suppression dans {0}"
-
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118
-msgid "Move"
-msgstr "Déplacer"
-
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:52
-#, java-format
-msgid "Resolve conflicts in member list of of relation {0}"
-msgstr "Résoudre les conflits dans la liste des membres de la relation {0}"
-
-#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66
-msgid "RemoveRelationMember"
-msgstr "RemoveRelationMember"
-
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
-msgid "Rotate"
-msgstr "Pivoter"
-
-#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88
-msgid "Sequence"
-msgstr "Séquence"
-
-#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:84
-#, java-format
-msgid "Resolve {0} tag conflicts in {1} {2}"
-msgstr "Résoudre {0} conflits d’étiquette dans {1} {2}"
-
-#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:57
-#, java-format
-msgid "Resolve version conflicts for {0} {1}"
-msgstr "Résoudre les conflits de version de {0} {1}"
-
-#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52
-#, java-format
-msgid "Resolve conflicts in node list of of way {0}"
-msgstr "Résoudre les conflits de la liste de noeuds du chemin {0}"
-
-#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
-msgid "Apply?"
-msgstr "Appliquer ?"
-
-#: ../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 ""
-"Les changements suivants aux propriétés du chemin sont suggérés après son "
-"retournement pour préserver la consistence des données."
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28
-msgid "Relation"
-msgstr "Relation"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30
-msgid "Old role"
-msgstr "Ancien rôle"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:32
-msgid "New role"
-msgstr "Nouveau rôle"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
-msgid "Old key"
-msgstr "Ancienne clé"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
-msgid "Old value"
-msgstr "Ancienne valeur"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
-msgid "New key"
-msgstr "Nouvelle clé"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
-msgid "New value"
-msgstr "Nouvelle valeur"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:40
-msgid "Apply selected changes"
-msgstr "Appliquer les changements sélectionnés"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41
-msgid "Don't apply changes"
-msgstr "Ne pas appliquer les changements"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:83
-msgid "Please select which property changes you want to apply."
-msgstr "Merci de sélectionner les changements que vous voulez appliquer"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:96
-msgid "Properties of "
-msgstr "Propriétés de "
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:120
-msgid "Roles in relations referring to"
-msgstr "Rôles de la relation de référence"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:136
-msgid "Automatic tag correction"
-msgstr "Correction automatique d’étiquette"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:314
-#, java-format
-msgid "Malformed config file at lines {0}"
-msgstr "Erreur dans le fichier de configuration aux lignes {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:324
-#, java-format
-msgid "Cannot open preferences directory: {0}"
-msgstr "Impossible d’ouvrir le répertoire des préférences : {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 ""
-"Le fichier des préférences contient des erreurs. Sauvegarde de l’ancien "
-"fichier dans {0}."
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:79
-#, java-format
-msgid "Preferences stored on {0}"
-msgstr "Préférences sauvegardées sur {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:82
-#, java-format
-msgid "Could not upload preferences. Reason: {0}"
-msgstr "Impossible de charger les préférences. Raison : {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:93
-msgid "Could not load preferences from server."
-msgstr "Impossible de charger les préférences depuis le serveur."
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:34
-msgid "different"
-msgstr "différent"
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:262
-msgid "deleted"
-msgstr "supprimé"
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
-msgid "true"
-msgstr "vrai"
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
-msgid "false"
-msgstr "faux"
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20
-msgid "position"
-msgstr "position"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30
-msgid "Decimal Degrees"
-msgstr "Degrés décimaux"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
-msgid "Degrees Minutes Seconds"
-msgstr "Degrés Minutes Secondes"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
-msgid "S"
-msgstr "S"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
-msgid "N"
-msgstr "N"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
-msgid "W"
-msgstr "O"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
-msgid "E"
-msgstr "E"
-
-#: ../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 "incomplet"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
-#, java-format
-msgid "Error: {0}"
-msgstr "Erreur : {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
-#, java-format
-msgid "Warning: {0}"
-msgstr "Attention : {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:101
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9
+msgid "relations"
+msgstr "relations"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10
+msgid "changeset"
+msgstr "jeu de données"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10
+msgid "changesets"
+msgstr "jeux de données"
+
+#: ../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"
@@ -2439,5 +2691,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:122
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "railway"
 msgstr "voie ferrée"
@@ -2459,4 +2711,62 @@
 msgstr[1] "{0} nœuds"
 
+#: ../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."
@@ -2606,5 +2916,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 "arrière-plan"
@@ -2693,8 +3003,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
@@ -2706,7 +3016,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
@@ -2815,10 +3125,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 "Nom d’utilisateur"
 
 #: ../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 "Mot de passe"
@@ -2917,22 +3227,22 @@
 msgstr "L’option {0} a été supprimée car elle n’est plus utilisée."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:146
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148
 msgid "File"
 msgstr "Fichier"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150
 msgid "View"
 msgstr "Affichage"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:149
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151
 msgid "Tools"
 msgstr "Outils"
 
-#: ../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 "Balises"
 
-#: ../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
@@ -2945,21 +3255,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 "Affichage de la grille"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:218
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221
 msgid "Toggle Wireframe view"
 msgstr "Bascule vers l'affichage de la grille"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:244
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:247
 msgid "Full Screen"
 msgstr "Plein écran"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:246
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:249
 msgid "Toggle Full Screen view"
 msgstr "Basculer en mode plein écran"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:286
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:289
 msgid "Audio"
 msgstr "Audio"
@@ -3031,6 +3341,6 @@
 msgstr "(aucun objet)"
 
-#: ../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 "le calque n’est pas dans la liste."
@@ -3040,9 +3350,9 @@
 msgstr "Contact du serveur OSM..."
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:104
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:105
 msgid "Error while parsing"
 msgstr "Erreur d’analyse"
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:107
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:108
 msgid "File not found"
 msgstr "Fichier non trouvé"
@@ -3117,5 +3427,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 "Membres"
@@ -3330,5 +3640,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
@@ -3414,5 +3724,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 "le paramètre {0} ne peut pas être vide"
@@ -3453,8 +3763,6 @@
 msgid ""
 "Properties in the merged element. They will replace properties in my "
-"elements when  merge decisions are applied."
-msgstr ""
-"Propriétés des éléments fusionnés. Elles remplaceront les propriétés des "
-"éléments lorsque les choix de fusion seront appliqués."
+"elements when merge decisions are applied."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88
@@ -3507,5 +3815,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 "Rôle"
@@ -3614,5 +3922,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
@@ -3727,5 +4035,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91
 msgid "Display the history of all selected items."
-msgstr "Afficher l’historique de tous less articles sélectionnés."
+msgstr "Afficher l’historique de tous les articles sélectionnés."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:103
@@ -3934,5 +4242,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 "Relations"
@@ -4040,66 +4348,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 "Appliquer les modifications"
 
-#: ../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 "Basique"
 
-#: ../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 "Occupé par"
 
-#: ../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 "lié"
 
-#: ../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 "Étiquettes (une valeur vide supprime l’étiquette)"
 
-#: ../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 "Déplacer vers le haut"
 
-#: ../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 "Déplacer les membres sélectionnés vers le haut"
 
-#: ../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 "Ajouter la sélection"
 
-#: ../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 "Ajouter les objets sélectionnés en tant que membres"
 
-#: ../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 "Supprimer la sélection"
 
-#: ../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 "Retirer tous les objets sélectionnés de la relation"
 
-#: ../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 "Déplacer vers le bas"
 
-#: ../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 "Déplacer les membres sélectionnés vers le bas"
 
-#: ../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 "Supprimer le membre de cette relation de l'entrée actuelle de la table"
 
-#: ../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 "Télécharger les membres"
 
-#: ../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 "Télécharger tous les chemins et les nœuds incomplets dans la relation"
@@ -4144,5 +4452,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
@@ -4163,9 +4471,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 "oui"
 
-#: ../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
@@ -4187,31 +4495,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 "non"
 
-#: ../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 "Membres : {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 "Editeur de relation : {0}"
 
-#: ../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 "Il y a eu des conflits pendant l’importation."
 
-#: ../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 "Erreur d'analyse de la réponse du serveur"
 
-#: ../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 "Impossible de se connecter au serveur."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:562
+msgid "Error when communicating with server."
+msgstr "Erreur de communication avec le serveur"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:67
@@ -4277,13 +4588,13 @@
 msgstr "Sources et types de données"
 
-#: ../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 "Télécharger en tant que nouveau calque"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:174
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:173
 msgid "Download Area"
 msgstr "Télécharger zone"
 
-#: ../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 ""
@@ -4291,5 +4602,5 @@
 "le serveur"
 
-#: ../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 ""
@@ -4320,5 +4631,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 "Lieux/endroits"
@@ -4365,21 +4676,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 "type"
@@ -4419,16 +4730,4 @@
 msgid "Tile Numbers"
 msgstr "Numéros des tuiles"
-
-#: ../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 ""
-"Vous pouvez utiliser la souris ou les boutons Ctrl+flèches pour zoomer et "
-"faire glisser."
-
-#. 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 "Carte"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:98
@@ -4507,5 +4806,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)"
@@ -4621,14 +4920,14 @@
 msgstr "Fichiers audio Wave (*.wav)"
 
-#: ../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 "Marqueurs audio de {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244
 msgid "Import images"
 msgstr "Importer des images"
 
-#: ../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, "
@@ -4637,5 +4936,5 @@
 msgstr[1] "{0} traces, "
 
-#: ../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, "
@@ -4644,5 +4943,5 @@
 msgstr[1] "{0} chemins, "
 
-#: ../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"
@@ -4651,28 +4950,28 @@
 msgstr[1] "{0} chemins"
 
-#: ../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 "Nom : {0}"
 
-#: ../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 "Description : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347
 msgid "Timespan: "
 msgstr "Intervalle de temps : "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354
 msgid "Length: "
 msgstr "Longueur : "
 
-#: ../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 "Convertir en calque de données"
 
-#: ../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 ""
@@ -4684,11 +4983,11 @@
 "regardez ici :"
 
-#: ../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
@@ -4698,29 +4997,29 @@
 msgstr "Converti depuis: {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 "Télécharger depuis OSM le long de cette trace"
 
-#: ../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 "Tout télécharger dans un rayon de :"
 
-#: ../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 "{0} mètres"
 
-#: ../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 "Aire maximale par requête:"
 
-#: ../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 "{0} km²"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:822
 #, java-format
 msgid ""
@@ -4731,5 +5030,5 @@
 "Voulez-vous<br>continuer ?</html>"
 
-#: ../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 ""
@@ -4737,5 +5036,5 @@
 "audio."
 
-#: ../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 "
@@ -4745,5 +5044,5 @@
 "chemin ont été omis ou déplacés au début."
 
-#: ../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 "
@@ -4753,33 +5052,44 @@
 "estimer leur horodatage ont été omis."
 
-#: ../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 "en dehors de la zone téléchargée"
 
-#: ../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 "version {0}"
 
-#: ../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 ""
+"Attention : le mélange de données 0.6 et 0.5 génère des données de version "
+"0.5"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:280
+#, java-format
+msgid "There were {0} conflicts during import."
+msgstr "Il y a eu {0} conflits durant l'import."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:388
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} est consistué de :"
 
-#: ../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} supprimés)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:371
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:396
 msgid "unset"
 msgstr "non défini"
 
-#: ../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 "Version de l’API : {0}"
 
-#: ../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"
@@ -4787,21 +5097,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"
@@ -4955,5 +5265,5 @@
 "été utilisé)."
 
-#: ../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
@@ -4962,5 +5272,5 @@
 msgstr "Veuille sélectionnez la rangée à éditer."
 
-#: ../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
@@ -4968,5 +5278,5 @@
 msgstr "Nouvelle valeur pour {0}"
 
-#: ../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
@@ -4976,5 +5286,5 @@
 msgstr "Veuillez sélectionnez la rangée à supprimer."
 
-#: ../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 "Entrez une nouvelle paire clé/valeur"
@@ -5874,106 +6184,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 "Nom"
@@ -6464,6 +6774,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:36
-msgid "Login name (email) to the OSM account."
-msgstr "Nom d’utilisateur (e-mail) du compte OSM."
+msgid "Login name (e-mail) to the OSM account."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
@@ -6479,6 +6789,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
-msgid "OSM username (email)"
-msgstr "Nom d’utilisateur OSM (courriel)"
+msgid "OSM username (e-mail)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
@@ -6489,10 +6799,7 @@
 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 ""
-"<html>ATTENTION : Le mot de passe est stocké en texte brut dans le fichier "
-"de préférences.<br>Le mot de passe est transféré en texte brut au serveur, "
-"encodé dans l’URL.<br><b>N’utilisez pas un mot de passe de valeur.</b></html>"
 
 #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on
@@ -6810,6 +7117,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 "Contact du serveur OSM..."
@@ -6820,7 +7128,7 @@
 msgstr "Téléchargement des points {0} à {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 "Téléchargement des données OSM..."
@@ -6889,15 +7197,14 @@
 msgstr "Erreur lors de l'import des trames NMEA !"
 
-#: ../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 "Cette version de JOSM est incompatible avec le serveur défini."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:207
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172
 #, java-format
 msgid ""
@@ -6908,5 +7215,5 @@
 "supporte que les versions {0} à {1}."
 
-#: ../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}"
@@ -6914,26 +7221,32 @@
 "Communication établie avec {0} en utilisant le protocole de version {1}"
 
-#: ../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 "Impossible de lire une valeur numérique dans la réponse"
-
-#: ../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 "Ouverture de la révision..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:351
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298
 msgid "Closing changeset..."
 msgstr "Fermeture de la révision..."
 
-#: ../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 "Pas de nouveau changement à envoyer"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:376
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:321
 msgid "Preparing..."
 msgstr "Préparation en cours..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:381
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:326
 msgid "Uploading..."
 msgstr "Envoi en cours..."
@@ -6948,25 +7261,25 @@
 msgstr "Fichier bz2 invalide."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:80
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:73
 msgid "Incorrect password or username."
 msgstr "Mot de passe ou nom d’utilisateur incorrect."
 
-#: ../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 "Attention : Le mot de passe est transféré non-crypté."
 
-#: ../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 "Sauvegarder l’utilisateur et le mot de passe (non crypté)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:89
 msgid "Enter Password"
 msgstr "Entrer le mot de passe"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
 msgid "Login"
 msgstr "Identifiant"
 
-#: ../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..."
@@ -6977,4 +7290,47 @@
 msgstr "Fichiers compressés gzip du serveur OSM"
 
+#: ../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."
@@ -7073,9 +7429,23 @@
 msgstr "id du nœud mal formé"
 
-#: ../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 "Contact du serveur..."
 
-#: ../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."
@@ -7084,17 +7454,9 @@
 "Internet."
 
-#: ../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 ""
-"Le serveur a retourné une erreur. Essayez de réduire la taille de la zone à "
-"charger, et/ou attendez un peu avant de recommencer."
-
-#: ../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 ""
 
@@ -7110,5 +7472,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 "Télécharger les greffons"
@@ -7300,9 +7662,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 "Télécharger les greffons manquants"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:128
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:119
 #, java-format
 msgid ""
@@ -7315,6 +7677,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
@@ -7337,35 +7699,35 @@
 msgstr "inconnu"
 
-#: ../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}: Version {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 "Greffon intégré à JOSM"
 
-#: ../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 "Erreur à la lecture du fichier d’information du greffon : {0}"
 
-#: ../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 "Ceci est après la fin de l’enregistrement"
 
-#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:329
+#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:340
 msgid "Error playing sound"
 msgstr "Erreur lors de la lecture du son"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
 msgid "Do nothing"
 msgstr "Ne rien faire"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
 msgid "Report Bug"
 msgstr "Signaler une erreur"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:52
 msgid ""
 "An unexpected exception occurred.\n"
@@ -7380,14 +7742,14 @@
 "rapport d'erreur."
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55
 msgid "Unexpected Exception"
 msgstr "Exception inattendue"
 
-#: ../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 "Veuillez rapporter un billet à {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 ""
@@ -7395,5 +7757,5 @@
 "que possible) !"
 
-#: ../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 "
@@ -7403,9 +7765,9 @@
 "rapporter un bogue."
 
-#: ../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 "Soyez sûr(e) d'inclure l'information suivante :"
 
-#: ../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 "(Ce texte a déjà été copié dans votre presse-papier.)"
@@ -7492,5 +7854,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 "Description"
@@ -7875,10 +8237,7 @@
 #: ../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 ""
-"Une erreur est survenue lors de l'association des photos avec la trace GPX. "
-"Vous pouvez ajuster les curseurs pour faire correspondre les photos "
-"manuellement."
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:853
@@ -7910,5 +8269,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"
@@ -7931,5 +8289,5 @@
 msgstr "Fichier tampon de la zone Lambert 4 (.4)"
 
-#: ../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
@@ -7996,5 +8354,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:213
 msgid "JOSM is stopped for the change to take effect."
-msgstr ""
+msgstr "JOSM est arreté pour que la modification prenne effet."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:28
@@ -8024,6 +8382,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/"
@@ -8117,6 +8475,6 @@
 msgstr "Ajouter \"source=...\" aux éléments ?"
 
-#: ../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
@@ -8124,11 +8482,11 @@
 msgstr "Téléchargement {0}"
 
-#: ../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 "Contact du serveur WMS..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:157
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:158
 msgid "Create buildings"
 msgstr "Créer les bêtiments"
@@ -8147,13 +8505,13 @@
 msgstr "Veuillez activer l'auto-sourcing et vérifier le millésime du cadastre."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:61
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:62
 msgid "Extract SVG ViewBox..."
 msgstr "Extraire le ViewBox du SVG"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:65
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:66
 msgid "Extract best fitting boundary..."
 msgstr "Extraction des meilleures limites..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:126
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:127
 msgid "Create boundary"
 msgstr "Créer la frontière"
@@ -8174,5 +8532,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 "Téléchargement depuis le serveur WMS du Cadastre français"
 
@@ -8272,5 +8630,5 @@
 "Sélectionnez en une dans la liste, puis réessayez"
 
-#: ../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
@@ -8278,61 +8636,28 @@
 msgstr "Calque vide"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:176
 #, java-format
 msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr "Calque WMS ({0}), {1} tuile(s) chargée(s)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:183
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:178
 msgid "Is not vectorized."
 msgstr "N'est pas vectorisée."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:179
 #, java-format
 msgid "Raster center: {0}"
 msgstr "Centre de la trame : {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181
 msgid "Is vectorized."
 msgstr "Est vectorisée."
 
-#: ../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 "Zone de délimitation de la commune : {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:282
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
-msgid "Save WMS layer to file"
-msgstr "Sauvegarder un calque WMS dans un fichier"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:287
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:295
-msgid "Save WMS layer"
-msgstr "Sauvegarder la couche WMS"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:309
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
-msgid "Load WMS layer from file"
-msgstr "Charger un calque WMS depuis un fichier"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:314
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:323
-msgid "Load WMS layer"
-msgstr "Charger la couche WMS"
-
-#: ../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 ""
-"Version du fichier WMS non supportée; version {0} trouvée, version {1} "
-"attendue"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:325
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:335
-msgid "File Format Error"
-msgstr "Erreur de format de fichier"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:481
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:401
 #, java-format
 msgid ""
@@ -8343,15 +8668,14 @@
 "Veuillez en créer un nouveau."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:482
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402
 msgid "Cache Format Error"
 msgstr "Erreur de format du tampon"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:497
-#, java-format
-msgid "Lambert zone {0} in cache  incompatible with current Lambert zone {1}"
-msgstr ""
-"Zine Lambert {0} du tampon incompatible avec la zone de Lambert courante {1}"
-
-#: ../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 "Erreur de tampon de zone Lambert"
@@ -8449,11 +8773,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 "Importer un chemin depuis le calque GPX"
 
 #: ../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 "Abandonner le chemin existant"
@@ -8463,5 +8787,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 "Pas de calque de données GPX trouvé."
@@ -8755,4 +9079,8 @@
 msgid "Lakewalker trace"
 msgstr "Trace Lakewalker"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:10
+msgid "An unknown error has occurred"
+msgstr ""
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
@@ -9080,18 +9408,18 @@
 msgstr "LiveGPS"
 
-#: ../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 "Valeurs mesurées"
 
-#: ../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 "Ouvrir la fenêtre de mesure."
 
-#: ../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 "Réinitialiser"
 
-#: ../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 ""
@@ -9099,25 +9427,25 @@
 "mesure."
 
-#: ../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 "Longueur du chemin"
 
-#: ../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 "Longueur de sélection"
 
-#: ../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 "Surface de sélection"
 
-#: ../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 "Angle"
 
-#: ../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 "Angle entre deux nœuds sélectionnés"
 
-#: ../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 "Calque où faire des mesures"
@@ -9178,7 +9506,6 @@
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
-msgid "Open the OpenStreetBugs window and activate the automatic download"
-msgstr ""
-"Ouvrir la fenêtre OpenStreetBugs et activer le téléchargement automatique"
+msgid "Opens the OpenStreetBugs window and activates the automatic download"
+msgstr ""
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:123
@@ -9257,5 +9584,5 @@
 msgstr "Osmarender"
 
-#: ../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 "
@@ -9265,9 +9592,9 @@
 "carte des Préférences."
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:123
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:127
 msgid "osmarender options"
 msgstr "options osmarender"
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:124
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:128
 msgid "Firefox executable"
 msgstr "Exécutable Firefox"
@@ -9705,5 +10032,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 "Nom de la rue"
@@ -9799,6 +10126,6 @@
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:195
-msgid "No intersections found. Nothing was changed."
-msgstr "Pas d'intersection trouvée. Rien n'a été modifié."
+msgid "No intersection found. Nothing was changed."
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:217
@@ -10702,43 +11029,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 ""
-"Vous pouvez ajouter, éditer et supprimer des sources WMS dans l'onglet "
-"Préférences du greffon WMS - elles apparaitront ensuite dans le menu WMS.\n"
-"\n"
-"Vous pouvez également faire cela manuellement dans les Préférences avancées, "
-"en utilisant le schéma suivant :\n"
-"wmsplugin.url.1.name=Landsat\n"
-"wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n"
-"wmsplugin.url.2.name=NPE Maps... etc\n"
-"\n"
-"Exemple  d'URL WMS complet (landsat)\n"
-"http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n"
-"layers=global_mosaic&styles=&srs=EPSG:4326&\n"
-"format=image/jpeg \n"
-"\n"
-"Pour Metacartas Map Rectifier http://labs.metacarta.com/rectifier/ , vous "
-"devez seulement entrer l' 'id' correspondant.\n"
-"Pour ajouter une entrée Metacarta Map Rectifer dans le menu, créez "
-"manuellement l'URL comme dans cet exemple, en remplaçant 73 par l'id de "
-"votre image : \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"
-"Note : Assurez-vous que l'image est utilisable et sous une licence "
-"compatible. En cas de doute, ne l'utilisez pas."
-
-#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:54
+
+#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:53
 msgid "WMS Plugin Help"
 msgstr "Aide sur le greffon WMS"
@@ -10756,5 +11058,5 @@
 #, java-format
 msgid "WMS: {0}"
-msgstr ""
+msgstr "WMS: {0}"
 
 #. This service serves the purpose of "just this once" without forcing the user
@@ -10764,5 +11066,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:106
 msgid "Custom WMS Link"
-msgstr ""
+msgstr "Lien WMS Personalisé"
 
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:111
@@ -10797,5 +11099,5 @@
 msgstr "Ajuster la position du calque WMS sélectionné"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113
 #, java-format
 msgid ""
@@ -10842,4 +11144,31 @@
 msgid "Alpha channel"
 msgstr "Canal alpha"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
+msgid "Save WMS layer to file"
+msgstr "Sauvegarder un calque WMS dans un fichier"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:295
+msgid "Save WMS layer"
+msgstr "Sauvegarder la couche WMS"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
+msgid "Load WMS layer from file"
+msgstr "Charger un calque WMS depuis un fichier"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:323
+msgid "Load WMS layer"
+msgstr "Charger la couche WMS"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:334
+#, java-format
+msgid "Unsupported WMS file version; found {0}, expected {1}"
+msgstr ""
+"Version du fichier WMS non supportée; version {0} trouvée, version {1} "
+"attendue"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:335
+msgid "File Format Error"
+msgstr "Erreur de format de fichier"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:163
@@ -10935,4 +11264,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 ""
@@ -10951,5 +11285,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 "Une prise en charge du serveur WMS du cadastre français."
 
@@ -11280,5 +11614,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 "Référence"
@@ -11780,5 +12114,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 "Largeur (mètres)"
@@ -12247,7 +12581,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 "Type"
@@ -12863,10 +13197,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 "Compagnie"
@@ -13078,7 +13412,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 "Altitude"
@@ -14010,5 +14344,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 "Péage/Forfait"
@@ -14144,5 +14478,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 "Référence (numéro de voie)"
@@ -14150,5 +14484,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 "Surface"
@@ -14200,11 +14534,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 "Abri"
+
+#. item "Public Transport/Bus Stop" check "Shelter"
 #. </optional>
-#: build/trans_presets.java:1503
+#: build/trans_presets.java:1504
 msgid "Bus Platform"
 msgstr "Plateforme de bus"
 
 #. item
-#: build/trans_presets.java:1504
+#: build/trans_presets.java:1505
 msgid "Edit Bus Platform"
 msgstr "Éditer une plateforme de bus"
@@ -14212,5 +14556,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1512
+#: build/trans_presets.java:1513
 msgid "Taxi"
 msgstr "Taxi"
@@ -14218,5 +14562,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 "Editez une station de taxi"
@@ -14224,5 +14568,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1519
+#: build/trans_presets.java:1520
 msgid "Airport"
 msgstr "Aéroport"
@@ -14230,15 +14574,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 "Modifier aéroport"
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1526
+#: build/trans_presets.java:1527
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1527
+#: build/trans_presets.java:1528
 msgid "ICAO"
 msgstr "ICAO"
@@ -14247,5 +14591,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1532
+#: build/trans_presets.java:1533
 msgid "Accomodation"
 msgstr "Hôtel"
@@ -14257,5 +14601,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 "Hôtel"
@@ -14264,15 +14608,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 "Éditer un hôtel"
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1539
+#: build/trans_presets.java:1540
 msgid "Stars"
 msgstr "Étoiles"
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1541
+#: build/trans_presets.java:1542
 msgid "Motel"
 msgstr "Môtel"
@@ -14280,20 +14624,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 "Éditer un motel"
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1547
+#: build/trans_presets.java:1548
 msgid "Guest House"
 msgstr "Chambre d’hôte"
 
 #. item
-#: build/trans_presets.java:1548
+#: build/trans_presets.java:1549
 msgid "Edit Guest House"
 msgstr "Éditer une chambre d’hôte"
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1552
+#: build/trans_presets.java:1553
 msgid "Chalet"
 msgstr "Châlet"
@@ -14301,10 +14645,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 "Editez un châlet"
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1558
+#: build/trans_presets.java:1559
 msgid "Hostel"
 msgstr "Hôtel"
@@ -14312,30 +14656,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 "Éditer une auberge de jeunesse"
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1564
+#: build/trans_presets.java:1565
 msgid "Alpine Hut"
 msgstr "Chalet"
 
 #. item
-#: build/trans_presets.java:1565
+#: build/trans_presets.java:1566
 msgid "Edit Alpine Hut"
 msgstr "Modifier chalet"
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1570
+#: build/trans_presets.java:1571
 msgid "Caravan Site"
 msgstr "Site pour caravane"
 
 #. item
-#: build/trans_presets.java:1571
+#: build/trans_presets.java:1572
 msgid "Edit Caravan Site"
 msgstr "Éditer un  site pour caravane"
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1575
+#: build/trans_presets.java:1576
 msgid "Camping Site"
 msgstr "Camping"
@@ -14343,10 +14687,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 "Éditer un camping"
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1582
+#: build/trans_presets.java:1583
 msgid "Food+Drinks"
 msgstr "Nourriture & boissons"
@@ -14357,5 +14701,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 "Restaurant"
@@ -14363,5 +14707,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 "Éditer un restaurant"
@@ -14369,5 +14713,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 "Cuisine"
@@ -14375,61 +14719,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 "italien"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "chinese"
 msgstr "chinois"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "burger"
 msgstr "hamburger"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "greek"
 msgstr "greque"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "german"
 msgstr "allemand"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "indian"
 msgstr "indien"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "regional"
 msgstr "régional"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "turkish"
 msgstr "turque"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "asian"
 msgstr "asiatique"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "thai"
 msgstr "thaïlandais"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "mexican"
 msgstr "mexicain"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "japanese"
 msgstr "japonais"
 
-#: build/trans_presets.java:1590
+#: build/trans_presets.java:1591
 msgid "Fast Food"
 msgstr "Fast Food"
@@ -14437,9 +14781,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 "Éditer un fast food"
 
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1598
 msgid "Cafe"
 msgstr "Café"
@@ -14447,10 +14791,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 "Editez un café"
 
 #. item "Food+Drinks/Cafe" text "Name"
-#: build/trans_presets.java:1603
+#: build/trans_presets.java:1604
 msgid "Pub"
 msgstr "Bar"
@@ -14458,20 +14802,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 "Pub"
 
 #. item "Food+Drinks/Pub" text "Name"
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1610
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item
-#: build/trans_presets.java:1610
+#: build/trans_presets.java:1611
 msgid "Edit Biergarten"
 msgstr "Éditer un biergarten"
 
 #. item "Food+Drinks/Biergarten" text "Name"
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1615
 msgid "Bar"
 msgstr "Bar"
@@ -14479,10 +14823,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 "Modifier Bar"
 
 #. item "Food+Drinks/Bar" text "Name"
-#: build/trans_presets.java:1620
+#: build/trans_presets.java:1621
 msgid "Nightclub"
 msgstr "Boîte de nuit"
@@ -14490,20 +14834,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 "Éditer une boîte de nuit"
 
 #. item "Food+Drinks/Nightclub" text "Name"
-#: build/trans_presets.java:1627
+#: build/trans_presets.java:1628
 msgid "Tourism"
 msgstr "Tourisme"
 
 #. group "Tourism"
-#: build/trans_presets.java:1628
+#: build/trans_presets.java:1629
 msgid "Attraction"
 msgstr "Attraction"
 
 #. item
-#: build/trans_presets.java:1629
+#: build/trans_presets.java:1630
 msgid "Edit Attraction"
 msgstr "Editez une attraction"
@@ -14512,11 +14856,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 "Horaires d’ouverture"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1634
+#: build/trans_presets.java:1635
 msgid "Museum"
 msgstr "Musée"
@@ -14524,10 +14868,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 "Éditer un musée"
 
 #. item "Tourism/Museum" text "Name"
-#: build/trans_presets.java:1640
+#: build/trans_presets.java:1641
 msgid "Zoo"
 msgstr "Zoo"
@@ -14536,10 +14880,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 "Editez un Zoo"
 
 #. item "Tourism/Zoo" text "Name"
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1648
 msgid "Viewpoint"
 msgstr "Point de vue"
@@ -14547,25 +14891,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 "Éditer un point de vue"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1652
+#: build/trans_presets.java:1653
 msgid "Look-Out Tower"
 msgstr "Tour de surveillance"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1654
+#: build/trans_presets.java:1655
 msgid "Theme Park"
 msgstr "Parc d’attraction"
 
 #. item
-#: build/trans_presets.java:1655
+#: build/trans_presets.java:1656
 msgid "Edit Theme Park"
 msgstr "Éditer un parc d’attraction"
 
 #. item "Tourism/Theme Park" text "Name"
-#: build/trans_presets.java:1659
+#: build/trans_presets.java:1660
 msgid "Artwork"
 msgstr "Oeuvre d’art"
@@ -14573,5 +14917,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 "Éditer une oeuvre d’art"
@@ -14579,5 +14923,5 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1667
 msgid "Information Office"
 msgstr "Office du Tourisme"
@@ -14585,83 +14929,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 "Modifier Office du Tourisme"
 
+#. item "Tourism/Information Office" text "Opening Hours"
+#: build/trans_presets.java:1675
+msgid "Map"
+msgstr "Carte"
+
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1679
 msgid "Map Type"
 msgstr "Type de carte"
 
 #. item "Tourism/Map" combo "Map Type"
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1679
 msgid "map"
 msgstr "carte"
 
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1679
 msgid "citymap"
 msgstr "carte de la ville"
 
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1679
 msgid "hikingmap"
 msgstr "carte de randonnée"
 
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1679
 msgid "bicyclemap"
 msgstr "carte de randonnée cycliste"
 
 #. 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 "Description détaillée"
 
 #. item "Tourism/Map" text "Closer Description"
-#: build/trans_presets.java:1681
+#: build/trans_presets.java:1682
 msgid "Information Board"
 msgstr "Bureau d'informations"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1686
 msgid "Board Type"
 msgstr "Type de bureau"
 
 #. item "Tourism/Information Board" combo "Board Type"
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1686
 msgid "board"
 msgstr "tableau"
 
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1686
 msgid "history"
 msgstr "histoire"
 
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1686
 msgid "nature"
 msgstr "nature"
 
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1686
 msgid "wildlife"
 msgstr "faune"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1688
+#: build/trans_presets.java:1689
 msgid "Guidepost (Hiking)"
 msgstr "Panneau de direction (randonnée)"
 
 #. item "Tourism/Guidepost (Hiking)" text "Elevation"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1696
 msgid "Other Information Points"
 msgstr "Autre points d'information"
 
-#. 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 "Abri"
-
-#. item
-#: build/trans_presets.java:1703
+#. item
+#: build/trans_presets.java:1704
 msgid "Edit Shelter"
 msgstr "Éditer un abri"
@@ -14669,25 +15010,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 "Âtre"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1709
 msgid "Picnic Site"
 msgstr "Site de pique-nique"
 
 #. item
-#: build/trans_presets.java:1709
+#: build/trans_presets.java:1710
 msgid "Edit Picnic Site"
 msgstr "Éditer un site de pique-nique"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1716
 msgid "Historic Places"
 msgstr "Patrimoine"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1716
+#: build/trans_presets.java:1717
 msgid "Castle"
 msgstr "Château"
@@ -14696,20 +15037,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 "Éditer un château"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1724
 msgid "Ruins"
 msgstr "Ruines"
 
 #. item
-#: build/trans_presets.java:1724
+#: build/trans_presets.java:1725
 msgid "Edit Ruins"
 msgstr "Éditer des ruines"
 
 #. item "Historic Places/Ruins" text "Name"
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1729
 msgid "Archaeological Site"
 msgstr "Site archéologique"
@@ -14718,10 +15059,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 "Éditer un site archéologique"
 
 #. item "Historic Places/Archaeological Site" text "Name"
-#: build/trans_presets.java:1735
+#: build/trans_presets.java:1736
 msgid "Battlefield"
 msgstr "Lieu de bataille"
@@ -14729,5 +15070,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 "Éditer un lieu de bataille"
@@ -14735,15 +15076,15 @@
 #. item "Historic Places/Battlefield" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1743
 msgid "Monument"
 msgstr "Monument commémoratif"
 
 #. item
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1744
 msgid "Edit Monument"
 msgstr "Editez un monument"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1748
 msgid "Memorial"
 msgstr "Mémorial"
@@ -14751,45 +15092,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 "Éditer un mémorial"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1753
+#: build/trans_presets.java:1754
 msgid "Wayside Cross"
 msgstr "Croix"
 
 #. item
-#: build/trans_presets.java:1754
+#: build/trans_presets.java:1755
 msgid "Edit Wayside Cross"
 msgstr "Éditer une croix"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1758
+#: build/trans_presets.java:1759
 msgid "Wayside Shrine"
 msgstr "Chapelle"
 
 #. item
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1760
 msgid "Edit Wayside Shrine"
 msgstr "Éditer une Chapelle"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1765
 msgid "Leisure"
 msgstr "Loisir"
 
 #. group "Leisure"
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1766
 msgid "Water Park"
 msgstr "Parc aquatique"
 
 #. item
-#: build/trans_presets.java:1766
+#: build/trans_presets.java:1767
 msgid "Edit Water Park"
 msgstr "Éditer un parc aquatique"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1770
+#: build/trans_presets.java:1771
 msgid "Playground"
 msgstr "Aire de jeux"
@@ -14797,15 +15138,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 "Éditer une zone de jeu"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1776
+#: build/trans_presets.java:1777
 msgid "Fishing"
 msgstr "Pêche"
 
 #. item
-#: build/trans_presets.java:1777
+#: build/trans_presets.java:1778
 msgid "Edit Fishing"
 msgstr "Éditer un lieu de pêche"
@@ -14813,15 +15154,15 @@
 #. item "Leisure/Fishing" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1783
+#: build/trans_presets.java:1784
 msgid "Sport Facilities"
 msgstr "Sport"
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1784
+#: build/trans_presets.java:1785
 msgid "Stadium"
 msgstr "Stade"
 
 #. item
-#: build/trans_presets.java:1785
+#: build/trans_presets.java:1786
 msgid "Edit Stadium"
 msgstr "Éditer un stade"
@@ -14835,6 +15176,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 "Selectionner un sport:"
@@ -15210,6 +15551,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
@@ -15242,227 +15583,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 "multi"
 
-#: 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 "tir à l'arc"
 
-#: 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 "athletics"
 
-#: 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 "australian_football"
 
-#: 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 "baseball"
 
-#: 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 "basketball"
 
-#: 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 "boules"
 
-#: 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 "boules"
 
-#: 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 "canoë"
 
-#: 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 "climbing"
 
-#: 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 "cricket"
 
-#: 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 "cricket_nets"
 
-#: 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 "croquet"
 
-#: 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 "cycling"
 
-#: 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 "dog_racing"
 
-#: 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 "équitation"
 
-#: 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 "football"
 
-#: 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 "golf"
 
-#: 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 "gymnastics"
 
-#: 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 "hockey"
 
-#: 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 "horse_racing"
 
-#: 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 "moteur"
 
-#: 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 "pelote"
 
-#: 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 "racquet"
 
-#: 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 "rugby"
 
-#: 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 "chasse"
 
-#: 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 "skateboard"
 
-#: 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 "skate"
 
-#: 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 "ski"
 
-#: 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 "football"
 
-#: 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 "swimming"
 
-#: 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 "table_tennis"
 
-#: 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 "tennis"
 
-#: build/trans_presets.java:1793
+#: build/trans_presets.java:1794
 msgid "Sports Centre"
 msgstr "Centre sportif"
 
 #. item
-#: build/trans_presets.java:1794
+#: build/trans_presets.java:1795
 msgid "Edit Sports Centre"
 msgstr "Éditer un centre sportif"
 
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1803
 msgid "Pitch"
 msgstr "Terrain de sport"
 
 #. item
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1804
 msgid "Edit Pitch"
 msgstr "Éditer un terrain de sport"
 
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1812
 msgid "Racetrack"
 msgstr "Circuit"
 
 #. item
-#: build/trans_presets.java:1812
+#: build/trans_presets.java:1813
 msgid "Edit Racetrack"
 msgstr "Éditer un circuit"
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1821
 msgid "Golf Course"
 msgstr "Parcours de Golf"
 
 #. item
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1822
 msgid "Edit Golf Course"
 msgstr "Éditer un terrain de golf"
 
 #. item "Sport Facilities/Golf Course" text "Name"
-#: build/trans_presets.java:1825
+#: build/trans_presets.java:1826
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item
-#: build/trans_presets.java:1826
+#: build/trans_presets.java:1827
 msgid "Edit Miniature Golf"
 msgstr "Éditer un minigolf"
 
 #. item "Sport Facilities/Miniature Golf" text "Name"
-#: build/trans_presets.java:1831
+#: build/trans_presets.java:1832
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1833
 msgid "Multi"
 msgstr "Multi"
 
 #. item
-#: build/trans_presets.java:1833
+#: build/trans_presets.java:1834
 msgid "Edit Multi"
 msgstr "Editer Multi"
@@ -15501,191 +15842,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 "Terrain"
 
-#: 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 "sports_centre"
 
-#: 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 "stadium"
 
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1839
 msgid "10pin"
 msgstr "Bowling"
 
 #. item
-#: build/trans_presets.java:1839
+#: build/trans_presets.java:1840
 msgid "Edit 10pin"
 msgstr "Éditer un Bowling"
 
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1845
 msgid "Athletics"
 msgstr "Athlétisme"
 
 #. item
-#: build/trans_presets.java:1845
+#: build/trans_presets.java:1846
 msgid "Edit Athletics"
 msgstr "Éditer athlétisme"
 
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1851
 msgid "Archery"
 msgstr "Tir à l’arc"
 
 #. item
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:1852
 msgid "Edit Archery"
 msgstr "Éditer tir à l’arc"
 
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:1857
 msgid "Climbing"
 msgstr "Escalade"
 
 #. item
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:1858
 msgid "Edit Climbing"
 msgstr "Éditer escalade"
 
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1863
 msgid "Canoeing"
 msgstr "Canoë"
 
 #. item
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:1864
 msgid "Edit Canoeing"
 msgstr "Éditer canoë"
 
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:1869
 msgid "Cycling"
 msgstr "Cyclisme"
 
 #. item
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1870
 msgid "Edit Cycling"
 msgstr "Éditer cyclisme"
 
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1875
 msgid "Dog Racing"
 msgstr "Course de chiens"
 
 #. item
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1876
 msgid "Edit Dog Racing"
 msgstr "Éditer course de chiens"
 
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1881
 msgid "Equestrian"
 msgstr "Equitation"
 
 #. item
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:1882
 msgid "Edit Equestrian"
 msgstr "Éditer sports équestres"
 
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1887
 msgid "Horse Racing"
 msgstr "Course de chevaux"
 
 #. item
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1888
 msgid "Edit Horse Racing"
 msgstr "Éditer course de chevaux"
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:1893
 msgid "Gymnastics"
 msgstr "Gymnastique"
 
 #. item
-#: build/trans_presets.java:1893
+#: build/trans_presets.java:1894
 msgid "Edit Gymnastics"
 msgstr "Éditer gymnastique"
 
-#: build/trans_presets.java:1898
+#: build/trans_presets.java:1899
 msgid "Motor Sports"
 msgstr "Sports mécaniques"
 
 #. item
-#: build/trans_presets.java:1899
+#: build/trans_presets.java:1900
 msgid "Edit Motor Sports"
 msgstr "Éditer sports mécaniques"
 
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:1905
 msgid "Skating"
 msgstr "Skate"
 
 #. item
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:1906
 msgid "Edit Skating"
 msgstr "Éditer patin à roulettes"
 
-#: build/trans_presets.java:1910
+#: build/trans_presets.java:1911
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:1912
 msgid "Edit Skateboard"
 msgstr "Éditer skateboard"
 
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:1917
 msgid "Swimming"
 msgstr "Natation"
 
 #. item
-#: build/trans_presets.java:1917
+#: build/trans_presets.java:1918
 msgid "Edit Swimming"
 msgstr "Éditer natation"
 
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:1923
 msgid "Skiing"
 msgstr "Ski"
@@ -15693,56 +16034,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 "ski"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1928
 msgid "Piste type"
 msgstr "Type de piste"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1928
 msgid "downhill"
 msgstr "de descente"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1928
 msgid "nordic"
 msgstr "nordique"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1928
 msgid "snow_park"
 msgstr "snow park"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:1929
 msgid "Difficulty"
 msgstr "Difficulté"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:1929
 msgid "novice"
 msgstr "verte"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:1929
 msgid "easy"
 msgstr "bleue"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:1929
 msgid "intermediate"
 msgstr "intermédiaire"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:1929
 msgid "advanced"
 msgstr "avancé"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:1929
 msgid "expert"
 msgstr "expert"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:1929
 msgid "freeride"
 msgstr "jaune"
 
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1932
 msgid "Shooting"
 msgstr "Tirer"
@@ -15750,178 +16091,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 "Éditer tir sportif"
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1940
 msgid "Sport (Ball)"
 msgstr "Sport de balle"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1941
 msgid "Soccer"
 msgstr "Football"
 
 #. item
-#: build/trans_presets.java:1941
+#: build/trans_presets.java:1942
 msgid "Edit Soccer"
 msgstr "Éditer football"
 
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:1947
 msgid "Football"
 msgstr "Football"
 
 #. item
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:1948
 msgid "Edit Football"
 msgstr "Éditer football"
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1953
 msgid "Australian Football"
 msgstr "Football australien"
 
 #. item
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:1954
 msgid "Edit Australian Football"
 msgstr "Éditer football australien"
 
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:1959
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:1960
 msgid "Edit Baseball"
 msgstr "Éditer baseball"
 
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:1965
 msgid "Basketball"
 msgstr "Basketball"
 
 #. item
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:1966
 msgid "Edit Basketball"
 msgstr "Éditer basketball"
 
-#: 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 "Editer un Golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1975
 msgid "golf_course"
 msgstr "golf_course"
 
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:1977
 msgid "Boule"
 msgstr "Boules"
 
 #. item
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:1978
 msgid "Edit Boule"
 msgstr "Éditer boules"
 
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:1983
 msgid "Bowls"
 msgstr "Boules"
 
 #. item
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1984
 msgid "Edit Bowls"
 msgstr "Éditer bowls"
 
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:1989
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:1990
 msgid "Edit Cricket"
 msgstr "Éditer cricket"
 
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:1995
 msgid "Cricket Nets"
 msgstr "Filets de cricket"
 
 #. item
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:1996
 msgid "Edit Cricket Nets"
 msgstr "Éditer filets de cricket"
 
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:2001
 msgid "Croquet"
 msgstr "Croquet"
 
 #. item
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:2002
 msgid "Edit Croquet"
 msgstr "Éditer croquet"
 
-#: build/trans_presets.java:2006
+#: build/trans_presets.java:2007
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item
-#: build/trans_presets.java:2007
+#: build/trans_presets.java:2008
 msgid "Edit Hockey"
 msgstr "Éditer hockey"
 
-#: build/trans_presets.java:2012
+#: build/trans_presets.java:2013
 msgid "Pelota"
 msgstr "Pelote"
 
 #. item
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2014
 msgid "Edit Pelota"
 msgstr "Éditer pelote basque"
 
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2019
 msgid "Racquet"
 msgstr "Sports de raquette"
 
 #. item
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2020
 msgid "Edit Racquet"
 msgstr "Éditer sports de raquette"
 
-#: build/trans_presets.java:2024
+#: build/trans_presets.java:2025
 msgid "Rugby"
 msgstr "Rugby"
 
 #. item
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2026
 msgid "Edit Rugby"
 msgstr "Éditer rugby"
 
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:2031
 msgid "Table Tennis"
 msgstr "Tennis de table"
 
 #. item
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2032
 msgid "Edit Table Tennis"
 msgstr "Éditer tennis de table"
 
-#: 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 "Éditer tennis"
 
 #. <separator/>
-#: build/trans_presets.java:2044
+#: build/trans_presets.java:2045
 msgid "Buildings"
 msgstr "Bâtiments"
 
 #. group "Buildings"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2046
 msgid "Building"
 msgstr "Bâtiment"
@@ -15929,5 +16270,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2049
 msgid "Public Building"
 msgstr "Bâtiment officiel"
@@ -15935,10 +16276,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 "Éditer un bâtiment officiel"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2055
 msgid "Town hall"
 msgstr "Mairie"
@@ -15946,10 +16287,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 "Éditer une mairie"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2061
 msgid "Embassy"
 msgstr "Ambassade"
@@ -15957,10 +16298,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 "Editer une ambassade"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2066
+#: build/trans_presets.java:2067
 msgid "Courthouse"
 msgstr "Palais de justice"
@@ -15969,10 +16310,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 "Éditer un palais de justice"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2074
 msgid "Prison"
 msgstr "Prison"
@@ -15981,10 +16322,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 "Éditer une prison"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2080
+#: build/trans_presets.java:2081
 msgid "Police"
 msgstr "Poste de police"
@@ -15994,10 +16335,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 "Éditer un poste de police"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2089
 msgid "Fire Station"
 msgstr "Caserne de pompiers"
@@ -16006,10 +16347,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 "Éditer une caserne de pompiers"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2096
 msgid "Post Office"
 msgstr "Bureau de poste"
@@ -16017,5 +16358,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 "Éditer un bureau de poste"
@@ -16023,15 +16364,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2103
 msgid "Kindergarten"
 msgstr "Jardin d’enfants"
 
 #. item
-#: build/trans_presets.java:2103
+#: build/trans_presets.java:2104
 msgid "Edit Kindergarten"
 msgstr "Éditer un jardin d’enfants"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2108
 msgid "School"
 msgstr "École"
@@ -16039,10 +16380,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 "Éditer une école"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2114
 msgid "University"
 msgstr "Université"
@@ -16050,10 +16391,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 "Éditer une université"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2120
 msgid "College"
 msgstr "Établissement d’enseignement supérieur"
@@ -16061,5 +16402,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 "Éditer un établissement d’enseignement supérieur"
@@ -16067,5 +16408,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2126
+#: build/trans_presets.java:2127
 msgid "Cinema"
 msgstr "Cinema"
@@ -16074,10 +16415,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 "Éditer un cinéma"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2133
+#: build/trans_presets.java:2134
 msgid "Library"
 msgstr "Bibliothèque"
@@ -16086,10 +16427,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 "Éditer une bibliothèque"
 
 #. item "Buildings/Library" text "Name"
-#: build/trans_presets.java:2140
+#: build/trans_presets.java:2141
 msgid "Arts Centre"
 msgstr "Centre artistique"
@@ -16097,10 +16438,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 "Éditer un centre artistique"
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2146
+#: build/trans_presets.java:2147
 msgid "Theatre"
 msgstr "Théâtre"
@@ -16109,10 +16450,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 "Éditer un théatre"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2154
 msgid "Place of Worship"
 msgstr "Lieu de culte"
@@ -16122,5 +16463,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 "Éditer un lieu de culte"
@@ -16129,6 +16470,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 "Religion"
@@ -16137,66 +16478,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 "bahai"
 
-#: 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 "buddhist"
 
-#: 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 "christian"
 
-#: 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 "jain"
 
-#: 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 "jewish"
 
-#: 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 "muslim"
 
-#: 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 "unitarisme"
 
-#: 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 "zoroastrian"
 
-#: 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 "Dénomination"
@@ -16205,81 +16546,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 "anglican"
 
-#: 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 "catholique"
 
-#: 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 "evangelical"
 
-#: 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 "jehovahs_witness"
 
-#: 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 "lutheran"
 
-#: 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 "methodist"
 
-#: 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 "mormon"
 
-#: 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 "orthodox"
 
-#: 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 "pentecostal"
 
-#: 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 "presbyterian"
 
-#: 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 "protestant"
 
-#: 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 "quaker"
 
-#: 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 "shia"
 
-#: 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 "sunni"
 
 #. <separator/>
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2165
 msgid "Addresses"
 msgstr "Adresses"
@@ -16288,5 +16629,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 "Editez l'adresse"
@@ -16294,5 +16635,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2169
+#: build/trans_presets.java:2170
 msgid "House number"
 msgstr "Numéro du bâtiment"
@@ -16300,20 +16641,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2172
 msgid "House name"
 msgstr "Nom de la maison"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2174
 msgid "City name"
 msgstr "Nom de la ville"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2174
+#: build/trans_presets.java:2175
 msgid "Post code"
 msgstr "Code postal"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2176
 msgid "Country code"
 msgstr "Indicatif du pays"
@@ -16321,5 +16662,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2179
 msgid "Address Interpolation"
 msgstr "Interpolation d’adresse"
@@ -16328,5 +16669,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 "Éditer l’interpolation d’adresse"
@@ -16334,71 +16675,71 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2184
 msgid "Numbering scheme"
 msgstr "Schéma de numérotation"
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2184
 msgid "odd"
 msgstr "pair"
 
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2184
 msgid "even"
 msgstr "impair"
 
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2184
 msgid "all"
 msgstr "all"
 
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2184
 msgid "alphabetic"
 msgstr "alphabétique"
 
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2187
 msgid "Man Made"
 msgstr "Édifices"
 
 #. group "Man Made"
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2188
 msgid "Works"
 msgstr "Usine"
 
 #. item
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2189
 msgid "Edit Works"
 msgstr "Éditer une usine"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2193
 msgid "Tower"
 msgstr "Structure de hauteur"
 
 #. item
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2194
 msgid "Edit Tower"
 msgstr "Éditer une structure de hauteur"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2198
 msgid "Water Tower"
 msgstr "Château d’eau"
 
 #. item
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2199
 msgid "Edit Water Tower"
 msgstr "Éditer un château d’eau"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2203
 msgid "Gasometer"
 msgstr "Gazomètre"
 
 #. item
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2204
 msgid "Edit Gasometer"
 msgstr "Éditer un gazomètre"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2207
+#: build/trans_presets.java:2208
 msgid "Lighthouse"
 msgstr "Phare"
@@ -16406,10 +16747,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 "Éditer un phare"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2214
 msgid "Windmill"
 msgstr "Moulin à vent"
@@ -16417,10 +16758,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 "Éditer un moulin à vent"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2220
 msgid "Pipeline"
 msgstr "Pipeline"
@@ -16428,10 +16769,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 "Éditer un pipeline"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2225
+#: build/trans_presets.java:2226
 msgid "Wastewater Plant"
 msgstr "Station d’épuration"
@@ -16441,10 +16782,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 "Éditer une station d’épuration"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2233
+#: build/trans_presets.java:2234
 msgid "Crane"
 msgstr "Grue"
@@ -16452,10 +16793,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 "Éditer une grue permanente"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2239
+#: build/trans_presets.java:2240
 msgid "Beacon"
 msgstr "Balise signalétique"
@@ -16463,10 +16804,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 "Editer balise signalétique"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2245
+#: build/trans_presets.java:2246
 msgid "Survey Point"
 msgstr "Équipement de topographie"
@@ -16474,10 +16815,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 "Éditer un équipement de topographie"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2252
 msgid "Surveillance"
 msgstr "Surveillance"
@@ -16485,5 +16826,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 "Éditer une caméra de surveillance"
@@ -16491,5 +16832,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2258
+#: build/trans_presets.java:2259
 msgid "Power Generator"
 msgstr "Centrale électrique"
@@ -16499,39 +16840,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 "Éditer une centrale électrique"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "wind"
 msgstr "wind"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "hydro"
 msgstr "hydro"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "fossil"
 msgstr "fossil"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "nuclear"
 msgstr "nuclear"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "coal"
 msgstr "charbon"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "photovoltaic"
 msgstr "photovoltaïque"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "gas"
 msgstr "gaz"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2268
 msgid "Power Station"
 msgstr "Station électrique"
@@ -16540,10 +16881,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 "Editez une station électrique"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2274
+#: build/trans_presets.java:2275
 msgid "Power Sub Station"
 msgstr "Transformateur électrique"
@@ -16552,5 +16893,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 "Modifier transformateur électrique"
@@ -16558,10 +16899,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 "Champ de vision"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2282
+#: build/trans_presets.java:2283
 msgid "Power Tower"
 msgstr "Pylône électrique"
@@ -16572,5 +16913,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 "Éditer un pylône électrique"
@@ -16578,5 +16919,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 "Ligne de courant"
@@ -16585,25 +16926,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 "Editez une ligne de courant"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2298
 msgid "Voltage"
 msgstr "Tension"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2299
 msgid "Amount of Wires"
 msgstr "Nombre de câbles"
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2301
+#: build/trans_presets.java:2302
 msgid "Amenities"
 msgstr "Équipements"
 
 #. group "Amenities"
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2303
 msgid "Toilets"
 msgstr "Toilettes"
@@ -16611,20 +16952,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 "Numéro de référence"
 
 #. 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 "Note"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2312
 msgid "Post Box"
 msgstr "Boîte aux lettres"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2317
 msgid "Telephone"
 msgstr "Téléphone"
@@ -16633,5 +16974,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 "Éditer un téléphone"
@@ -16639,5 +16980,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 "Pièces"
@@ -16645,5 +16986,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 "Billets"
@@ -16651,5 +16992,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 "Cartes de crédit temporaire"
@@ -16657,5 +16998,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 "Cartes de débit"
@@ -16663,15 +17004,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 "Cartes de crédits"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2328
 msgid "Telephone cards"
 msgstr "Cartes téléphoniques"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2330
 msgid "Recycling"
 msgstr "Recyclage"
@@ -16680,5 +17021,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 "Éditer un point de recylcage"
@@ -16686,35 +17027,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 "Batteries"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2336
 msgid "Cans"
 msgstr "Canettes"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2337
 msgid "Clothes"
 msgstr "Vêtements"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2338
 msgid "Glass"
 msgstr "Verre"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2339
 msgid "Paper"
 msgstr "Papier"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2340
 msgid "Scrap Metal"
 msgstr "Ferrailleur"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2342
 msgid "Bench"
 msgstr "Banc"
@@ -16723,20 +17064,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 "Hutte de chasse"
 
 #. item
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2347
 msgid "Edit Hunting Stand"
 msgstr "Hutte de chasse"
 
 #. item "Amenities/Hunting Stand" check "Shelter"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2350
 msgid "Hide"
 msgstr "Masquer"
 
 #. item "Amenities/Hunting Stand" check "Hide"
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2351
 msgid "Lock"
 msgstr "Verrouiller"
@@ -16744,22 +17085,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 "Hauteur"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2351
+#: build/trans_presets.java:2352
 msgid "low"
 msgstr "faible"
 
-#: build/trans_presets.java:2351
+#: build/trans_presets.java:2352
 msgid "half"
 msgstr "à moitié"
 
-#: build/trans_presets.java:2351
+#: build/trans_presets.java:2352
 msgid "full"
 msgstr "complet"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2354
 msgid "Fountain"
 msgstr "Fontaine"
@@ -16768,10 +17109,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 "Éditer une fontaine"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2361
 msgid "Drinking Water"
 msgstr "Eau potable"
@@ -16780,10 +17121,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 "Éditer un point d’eau potable"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2367
+#: build/trans_presets.java:2368
 msgid "Baby Hatch"
 msgstr "Tour d’abandon (nouveau né)"
@@ -16791,25 +17132,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 "Éditer un tour d’abandon"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2375
+#: build/trans_presets.java:2376
 msgid "Shops"
 msgstr "Magasins"
 
 #. group "Shops"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2377
 msgid "Supermarket"
 msgstr "Supermarché"
 
 #. item
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2378
 msgid "Edit Supermarket"
 msgstr "Éditer un supermarché"
 
 #. item "Shops/Supermarket" text "Name"
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:2382
 msgid "Convenience Store"
 msgstr "Commerce de proximité"
@@ -16817,10 +17158,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 "Éditer une épicerie"
 
 #. item "Shops/Convenience Store" text "Name"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2388
 msgid "Kiosk"
 msgstr "Kiosque à journaux"
@@ -16828,10 +17169,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 "Éditer un kiosque à journaux"
 
 #. item "Shops/Kiosk" text "Name"
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2394
 msgid "Vending machine"
 msgstr "Distributeur automatique"
@@ -16839,5 +17180,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 "Éditer un distributeur automatique"
@@ -16845,88 +17186,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 "Produits vendus"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "public_transport_tickets"
 msgstr "public_transport_tickets"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "public_transport_plans"
 msgstr "public_transport_plans"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "parking_tickets"
 msgstr "parking_tickets"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "food"
 msgstr "food"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "drinks"
 msgstr "drinks"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "sweets"
 msgstr "bonbons"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "cigarettes"
 msgstr "cigarettes"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "photos"
 msgstr "photos"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "animal_food"
 msgstr "animal_food"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "news_papers"
 msgstr "news_papers"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "toys"
 msgstr "jouets"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "stamps"
 msgstr "stamps"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "SIM-cards"
 msgstr "SIM-cards"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "telephone_vouchers"
 msgstr "telephone_vouchers"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "vouchers"
 msgstr "vouchers"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "condoms"
 msgstr "condoms"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "tampons"
 msgstr "tampons"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "excrement_bags"
 msgstr "excrement_bags"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2407
 msgid "Account or loyalty cards"
 msgstr "Cartes de fidélité"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2408
+#: build/trans_presets.java:2409
 msgid "Butcher"
 msgstr "Boucherie"
@@ -16934,10 +17275,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 "Éditer une boucherie"
 
 #. item "Shops/Butcher" text "Name"
-#: build/trans_presets.java:2414
+#: build/trans_presets.java:2415
 msgid "Baker"
 msgstr "Boulanger"
@@ -16945,10 +17286,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 "Éditer une boulangerie"
 
 #. item "Shops/Baker" text "Name"
-#: build/trans_presets.java:2420
+#: build/trans_presets.java:2421
 msgid "Florist"
 msgstr "Fleuriste"
@@ -16956,20 +17297,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 "Modifier fleuriste"
 
 #. item "Shops/Florist" text "Name"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2427
 msgid "Organic"
 msgstr "Boutique bio"
 
 #. item
-#: build/trans_presets.java:2427
+#: build/trans_presets.java:2428
 msgid "Edit Organic Shop"
 msgstr "Modifier boutique bio"
 
 #. item "Shops/Organic" text "Name"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2432
 msgid "Alcohol"
 msgstr "Alcool"
@@ -16977,60 +17318,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 "Modifier commerce d'acool"
 
 #. item "Shops/Alcohol" text "Name"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2438
 msgid "Beverages"
 msgstr "Boissons"
 
 #. item
-#: build/trans_presets.java:2438
+#: build/trans_presets.java:2439
 msgid "Edit Beverages Shop"
 msgstr "Modifier débit de boissons"
 
 #. item "Shops/Beverages" text "Name"
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:2443
 msgid "Computer"
 msgstr "Informatique"
 
 #. item
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2444
 msgid "Edit Computer Shop"
 msgstr "Modifier magasin informatique"
 
 #. item "Shops/Computer" text "Name"
-#: build/trans_presets.java:2447
+#: build/trans_presets.java:2448
 msgid "Electronics"
 msgstr "Électronique"
 
 #. item
-#: build/trans_presets.java:2448
+#: build/trans_presets.java:2449
 msgid "Edit Electronics Shop"
 msgstr "Modifier magasin d’électronique"
 
 #. item "Shops/Electronics" text "Name"
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2453
 msgid "Hifi"
 msgstr "Hi-Fi"
 
 #. item
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2454
 msgid "Edit Hifi Shop"
 msgstr "Modifier boutique Hi-Fi"
 
 #. item "Shops/Hifi" text "Name"
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2458
 msgid "Furniture"
 msgstr "Ameublement"
 
 #. item
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2459
 msgid "Edit Furniture Shop"
 msgstr "Modifier magasin d’ameublement"
 
 #. item "Shops/Furniture" text "Name"
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2463
 msgid "Garden Centre"
 msgstr "Jardinerie"
@@ -17038,10 +17379,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 "Modifier jardinerie"
 
 #. item "Shops/Garden Centre" text "Name"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2469
 msgid "Hardware"
 msgstr "Quincaillerie"
@@ -17049,10 +17390,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 "Modifier quincaillerie"
 
 #. item "Shops/Hardware" text "Name"
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2475
 msgid "Do-it-yourself-store"
 msgstr "Magasin de bricolage"
@@ -17060,60 +17401,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 "Éditer un magasin de bricolage"
 
 #. item "Shops/Do-it-yourself-store" text "Name"
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2481
 msgid "Stationery"
 msgstr "Papeterie"
 
 #. item
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2482
 msgid "Edit Stationery Shop"
 msgstr "Modifier papeterie"
 
 #. item "Shops/Stationery" text "Name"
-#: build/trans_presets.java:2485
+#: build/trans_presets.java:2486
 msgid "Hairdresser"
 msgstr "Coiffeur"
 
 #. item
-#: build/trans_presets.java:2486
+#: build/trans_presets.java:2487
 msgid "Edit Hairdresser"
 msgstr "Editez un Coiffeur"
 
 #. item "Shops/Hairdresser" text "Name"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2491
 msgid "Shoes"
 msgstr "Magasin de chaussures"
 
 #. item
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2492
 msgid "Edit Shoe Shop"
 msgstr "Modifier magasin de chaussures"
 
 #. item "Shops/Shoes" text "Name"
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2496
 msgid "Toys"
 msgstr "Jouets"
 
 #. item
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2497
 msgid "Edit Toy Shop"
 msgstr "Modifier magasin de jouets"
 
 #. item "Shops/Toys" text "Name"
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2501
 msgid "Video"
 msgstr "Vidéoclub"
 
 #. item
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2502
 msgid "Edit Video Shop"
 msgstr "Modifier vidéoclub"
 
 #. item "Shops/Video" text "Name"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2506
 msgid "Dry Cleaning"
 msgstr "Pressing"
@@ -17121,10 +17462,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 "Éditer un pressing"
 
 #. item "Shops/Dry Cleaning" text "Name"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2512
 msgid "Laundry"
 msgstr "Laverie libre-service"
@@ -17132,10 +17473,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 "Éditer une laverie"
 
 #. item "Shops/Laundry" text "Name"
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2518
 msgid "Outdoor"
 msgstr "Magasin de sports d’extérieur"
@@ -17143,35 +17484,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 "Éditer un magasin de sports d’extérieur"
 
 #. item "Shops/Outdoor" text "Name"
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2524
 msgid "Sports"
 msgstr "Sports"
 
 #. item
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2525
 msgid "Edit Sports Shop"
 msgstr "Modifier magasin de sport"
 
 #. item "Shops/Sports" text "Name"
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2529
 msgid "Optician"
 msgstr "Opticien"
 
 #. item
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2530
 msgid "Edit Optician"
 msgstr "Modifier opticien"
 
 #. item "Shops/Optician" text "Name"
-#: build/trans_presets.java:2535
+#: build/trans_presets.java:2536
 msgid "Cash"
 msgstr "Argent"
 
 #. group "Cash"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2537
 msgid "Bank"
 msgstr "Banque"
@@ -17179,5 +17520,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 "Editez une banque"
@@ -17185,10 +17526,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 "Distributeur automatique"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2544
 msgid "Money Exchange"
 msgstr "Bureau de change"
@@ -17196,5 +17537,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 "Éditer un bureau de change"
@@ -17202,15 +17543,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 "Éditer un distributeur automatique"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2557
 msgid "Health"
 msgstr "Santé"
 
 #. group "Health"
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2558
 msgid "Doctors"
 msgstr "Médecin"
@@ -17218,20 +17559,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 "Modifier Médecin"
 
 #. item "Health/Doctors" text "Name"
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2564
 msgid "Dentist"
 msgstr "Dentiste"
 
 #. item
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2565
 msgid "Edit Dentist"
 msgstr "Editez le Dentiste"
 
 #. item "Health/Dentist" text "Name"
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2569
 msgid "Pharmacy"
 msgstr "Pharmacie"
@@ -17239,5 +17580,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 "Éditer pharmacie"
@@ -17245,10 +17586,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 "Dispensaire"
 
 #. item "Health/Pharmacy" text "Name"
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2576
 msgid "Hospital"
 msgstr "Hôpital"
@@ -17256,10 +17597,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 "Éditer hôpital"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2582
 msgid "Emergency Access Point"
 msgstr "Point d’accès d’urgence"
@@ -17268,5 +17609,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 "Éditer point d’accès d’urgence"
@@ -17275,20 +17616,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2588
 msgid "Point Number"
 msgstr "Numéro du point"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2589
 msgid "Point Name"
 msgstr "Nom du point"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2591
 msgid "Phone Number"
 msgstr "Numéro de téléphone"
 
 #. 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 "(Utiliser le code international, comme +12-345-67890"
@@ -17296,5 +17637,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 "Vétérinaire"
@@ -17303,25 +17644,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 "Editez un Vétérinaire"
 
 #. group "Places"
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2605
 msgid "Continent"
 msgstr "Continent"
 
 #. item
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2606
 msgid "Edit Continent"
 msgstr "Éditer un continent"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2611
 msgid "Country"
 msgstr "Pays"
 
 #. item
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2612
 msgid "Edit Country"
 msgstr "Éditer un pays"
@@ -17329,30 +17670,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 "Département"
 
 #. item
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2618
 msgid "Edit State"
 msgstr "Éditer un état"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2622
+#: build/trans_presets.java:2623
 msgid "Region"
 msgstr "Région"
 
 #. item
-#: build/trans_presets.java:2623
+#: build/trans_presets.java:2624
 msgid "Edit Region"
 msgstr "Éditer une région"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2628
+#: build/trans_presets.java:2629
 msgid "County"
 msgstr "Comté/Canton"
 
 #. item
-#: build/trans_presets.java:2629
+#: build/trans_presets.java:2630
 msgid "Edit County"
 msgstr "Éditer un comté/canton"
@@ -17360,15 +17701,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2635
+#: build/trans_presets.java:2636
 msgid "City"
 msgstr "Ville de plus de 100 000 habitants"
 
 #. item
-#: build/trans_presets.java:2636
+#: build/trans_presets.java:2637
 msgid "Edit City"
 msgstr "Editez la ville"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2641
+#: build/trans_presets.java:2642
 msgid "Town"
 msgstr "Ville 10 000 à 100 000 habitants"
@@ -17376,10 +17717,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 "Editez la ville"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2649
 msgid "Suburb"
 msgstr "Banlieue"
@@ -17387,25 +17728,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 "Éditer une banlieue"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2656
 msgid "Village"
 msgstr "Village"
 
 #. item
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2657
 msgid "Edit Village"
 msgstr "Éditer un village"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2662
 msgid "Hamlet"
 msgstr "Hameau"
 
 #. item
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2663
 msgid "Edit Hamlet"
 msgstr "Éditer un hameau"
@@ -17413,5 +17754,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2669
 msgid "Locality"
 msgstr "Lieu-dit"
@@ -17419,10 +17760,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 "Éditer un lieu-dit"
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2676
 msgid "Island"
 msgstr "île"
@@ -17430,5 +17771,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 "Éditer une île"
@@ -17436,5 +17777,5 @@
 #. item "Places/Island" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2683
+#: build/trans_presets.java:2684
 msgid "Cave Entrance"
 msgstr "Entrée de grotte"
@@ -17442,10 +17783,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 "Éditer une entrée de grotte"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2690
 msgid "Peak"
 msgstr "Sommet"
@@ -17453,10 +17794,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 "Modifier un pic"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2697
 msgid "Glacier"
 msgstr "Glacier"
@@ -17464,10 +17805,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 "Éditer un glacier"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2703
+#: build/trans_presets.java:2704
 msgid "Volcano"
 msgstr "Volcan"
@@ -17475,70 +17816,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 "Éditer un volcan"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2711
+#: build/trans_presets.java:2712
 msgid "Boundaries"
 msgstr "Frontières"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2713
 msgid "National"
 msgstr "Nationale"
 
 #. item
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2714
 msgid "Edit National Boundary"
 msgstr "Éditer une frontière nationale"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2718
+#: build/trans_presets.java:2719
 msgid "Administrative"
 msgstr "Administrative"
 
 #. item
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2720
 msgid "Edit Administrative Boundary"
 msgstr "Éditer une frontière administrative"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2724
+#: build/trans_presets.java:2725
 msgid "Civil"
 msgstr "Civile"
 
 #. item
-#: build/trans_presets.java:2725
+#: build/trans_presets.java:2726
 msgid "Edit Civil Boundary"
 msgstr "Éditer une frontière civile"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2730
+#: build/trans_presets.java:2731
 msgid "Political"
 msgstr "Politique"
 
 #. item
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:2732
 msgid "Edit Political Boundary"
 msgstr "Éditer une zone électorale"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2736
+#: build/trans_presets.java:2737
 msgid "National park"
 msgstr "Parc national"
 
 #. item
-#: build/trans_presets.java:2737
+#: build/trans_presets.java:2738
 msgid "Edit National Park Boundary"
 msgstr "Éditer les frontières d’un parc national"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2744
 msgid "Land use"
 msgstr "Utilisation du terrain"
 
 #. group "Land use"
-#: build/trans_presets.java:2744
+#: build/trans_presets.java:2745
 msgid "Tree"
 msgstr "Arbre"
@@ -17547,15 +17888,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 "Éditer un arbre isolé"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2753
 msgid "Botanical Name"
 msgstr "Nom botanique"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2755
 msgid "Wood"
 msgstr "Bois"
@@ -17564,5 +17905,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 "Éditer un bois"
@@ -17570,17 +17911,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 "coniferous"
 
-#: build/trans_presets.java:2760 build/trans_presets.java:2769
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
 msgid "deciduous"
 msgstr "deciduous"
 
-#: build/trans_presets.java:2760 build/trans_presets.java:2769
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
 msgid "mixed"
 msgstr "mixed"
 
-#: build/trans_presets.java:2762
+#: build/trans_presets.java:2763
 msgid "Forest"
 msgstr "Forêt"
@@ -17589,14 +17930,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 "Éditer une forêt"
 
-#: build/trans_presets.java:2771
+#: build/trans_presets.java:2772
 msgid "Nature Reserve"
 msgstr "Réserve naturelle"
 
 #. item
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2773
 msgid "Edit Nature Reserve"
 msgstr "Éditer une réserve naturelle"
@@ -17604,25 +17945,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2777
+#: build/trans_presets.java:2778
 msgid "Scree"
 msgstr "Zone d’éboulements"
 
 #. item
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:2779
 msgid "Edit Scree"
 msgstr "Éditer une zone d’éboulements"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2783
 msgid "Scrub"
 msgstr "Broussailles"
 
 #. item
-#: build/trans_presets.java:2783
+#: build/trans_presets.java:2784
 msgid "Edit Scrub"
 msgstr "Éditer des broussailles"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2788
 msgid "Fell"
 msgstr "Talus"
@@ -17630,10 +17971,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 "Éditer un talus"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2794
 msgid "Heath"
 msgstr "Lande"
@@ -17641,5 +17982,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 "Éditer une lande"
@@ -17647,5 +17988,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2801
 msgid "Farmyard"
 msgstr "Bâtiments de ferme"
@@ -17654,45 +17995,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 "Éditer des bâtiments de ferme"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2808
+#: build/trans_presets.java:2809
 msgid "Farmland"
 msgstr "Terrains de ferme"
 
 #. item
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2810
 msgid "Edit Farmland Landuse"
 msgstr "Éditer des terrains de ferme"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2814
+#: build/trans_presets.java:2815
 msgid "Meadow"
 msgstr "Prairie"
 
 #. item
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2816
 msgid "Edit Meadow Landuse"
 msgstr "Editer prairie"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2820
+#: build/trans_presets.java:2821
 msgid "Vineyard"
 msgstr "Vigne"
 
 #. item
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2822
 msgid "Edit Vineyard Landuse"
 msgstr "Éditer une vigne"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2826
+#: build/trans_presets.java:2827
 msgid "Allotments"
 msgstr "Jardins familiaux"
 
 #. item
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:2828
 msgid "Edit Allotments Landuse"
 msgstr "Éditer des jardins familiaux"
@@ -17700,25 +18041,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2833
+#: build/trans_presets.java:2834
 msgid "Garden"
 msgstr "Jardin"
 
 #. item
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2835
 msgid "Edit Garden"
 msgstr "Éditer un jardin"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2838
+#: build/trans_presets.java:2839
 msgid "Grass"
 msgstr "Herbe"
 
 #. item
-#: build/trans_presets.java:2839
+#: build/trans_presets.java:2840
 msgid "Edit Grass Landuse"
 msgstr "Éditer de l’herbe"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2845
 msgid "Village Green"
 msgstr "Zone publique herborée"
@@ -17726,10 +18067,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 "Éditer une zone publique herborée"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:2852
 msgid "Common"
 msgstr "Espace commun"
@@ -17737,20 +18078,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 "Éditer un espace commun"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2858
 msgid "Park"
 msgstr "Parc"
 
 #. item
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:2859
 msgid "Edit Park"
 msgstr "Editez un Parc"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2863
 msgid "Recreation Ground"
 msgstr "Aire de jeux"
@@ -17758,5 +18099,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 "Éditer une aire de jeux"
@@ -17764,15 +18105,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2871
 msgid "Residential area"
 msgstr "Zone résidentielle"
 
 #. item
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2872
 msgid "Edit Residential Landuse"
 msgstr "Éditer une zone résidentielle"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2877
 msgid "Graveyard"
 msgstr "Petit cimetière"
@@ -17780,9 +18121,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 "Éditer un petit cimetière"
 
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:2885
 msgid "Cemetery"
 msgstr "Cimetière"
@@ -17790,39 +18131,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 "Éditer un cimetière"
 
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2894
 msgid "Retail"
 msgstr "Zone commerciale"
 
 #. item
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2895
 msgid "Edit Retail Landuse"
 msgstr "Éditer une zone commerciale"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2900
 msgid "Commercial"
 msgstr "Bureaux"
 
 #. item
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2901
 msgid "Edit Commercial Landuse"
 msgstr "Éditer des bureaux"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2906
 msgid "Industrial"
 msgstr "Zone industrielle"
 
 #. item
-#: build/trans_presets.java:2906
+#: build/trans_presets.java:2907
 msgid "Edit Industrial Landuse"
 msgstr "Éditer une zone industrielle"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2912
 msgid "Railway land"
 msgstr "Zone ferroviaire"
@@ -17830,15 +18171,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 "Éditer une zone ferroviaire"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:2919
 msgid "Military"
 msgstr "Militaire"
 
 #. item
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2920
 msgid "Edit Military Landuse"
 msgstr "Éditer un terrain militaire"
@@ -17846,55 +18187,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2925
+#: build/trans_presets.java:2926
 msgid "Construction area"
 msgstr "Zone de construction"
 
 #. item
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2927
 msgid "Edit Construction Landuse"
 msgstr "Éditer un chantier"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2932
 msgid "Brownfield"
 msgstr "Terrain en friche"
 
 #. item
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:2933
 msgid "Edit Brownfield Landuse"
 msgstr "Éditer un terrain en friche"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2937
+#: build/trans_presets.java:2938
 msgid "Greenfield"
 msgstr "Espace vert"
 
 #. item
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:2939
 msgid "Edit Greenfield Landuse"
 msgstr "Éditer une nouvelle zone de construction"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:2944
 msgid "Landfill"
 msgstr "Décharge"
 
 #. item
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:2945
 msgid "Edit Landfill Landuse"
 msgstr "Éditer une décharge"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2950
 msgid "Quarry"
 msgstr "Carrière"
 
 #. item
-#: build/trans_presets.java:2950
+#: build/trans_presets.java:2951
 msgid "Edit Quarry Landuse"
 msgstr "Éditer une carrière"
 
 #. group "Relations"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2960
 msgid "Multipolygon"
 msgstr "Multypoligone"
@@ -17904,5 +18245,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 "Modifier un multipolygone"
@@ -17911,10 +18252,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:2970
 msgid "outer segment"
 msgstr "segment extérieur"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:2970
+#: build/trans_presets.java:2971
 msgid "inner segment"
 msgstr "segment intérieur"
@@ -17922,5 +18263,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:2974
 msgid "Turn restriction"
 msgstr "Interdiction de tourner"
@@ -17929,5 +18270,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 "Modifier une interdiction de tourner"
@@ -17935,34 +18276,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 "Restriction"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_left_turn"
 msgstr "Interdiction de tourner à gauche"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_right_turn"
 msgstr "Interdiction de tourner à droite"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_straight_on"
 msgstr "Interdiction d'aller tout droit"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_u_turn"
 msgstr "Interdiction de faire demi-tour"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "only_right_turn"
 msgstr "Obligation de tourner à droite"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "only_left_turn"
 msgstr "Obligation de tourner à gauche"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "only_straight_on"
 msgstr "Obligation d'aller tout droit"
@@ -17971,15 +18312,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2983
+#: build/trans_presets.java:2984
 msgid "from way"
 msgstr "chemin d'origine"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2985
 msgid "via node or way"
 msgstr "nœud ou chemin de passage"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2986
 msgid "to way"
 msgstr "chemin destination"
@@ -17987,5 +18328,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:2988
+#: build/trans_presets.java:2989
 msgid "Route"
 msgstr "Route"
@@ -17994,5 +18335,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 "Modifier une route"
@@ -18000,5 +18341,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 "Type de route"
@@ -18070,5 +18411,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
@@ -18077,17 +18418,17 @@
 msgstr "vélo/bicyclette"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "bus"
 msgstr "bus"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "road"
 msgstr "route"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "ferry"
 msgstr "ferry"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "ski"
 msgstr "ski"
@@ -18140,5 +18481,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
@@ -18147,13 +18488,13 @@
 msgstr "piéton"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "hiking"
 msgstr "randonnée"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "tram"
 msgstr "tram"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "detour"
 msgstr "détour"
@@ -18167,10 +18508,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 "métro"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:2997
 msgid "Symbol description"
 msgstr "Description du symbole"
@@ -18178,26 +18519,26 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:2999
+#: build/trans_presets.java:3000
 msgid "Network"
 msgstr "Réseau"
 
 #. item "Relations/Route" combo "State"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "proposed"
 msgstr "proposé"
 
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "alternate"
 msgstr "alternatif"
 
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "temporary"
 msgstr "temporaire"
 
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "connection"
 msgstr "connexion"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3003
 msgid "Color (hex)"
 msgstr "Couleur (hexa)"
@@ -18206,30 +18547,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:3006
 msgid "route segment"
 msgstr "segment de route"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3007
 msgid "forward segment"
 msgstr "segment suivant"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3008
 msgid "backward segment"
 msgstr "segment précédent"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3009
 msgid "halt point"
 msgstr "point d'arrêt"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3010
 msgid "forward halt point"
 msgstr "point d'arrêt suivant"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3011
 msgid "backward halt point"
 msgstr "point d'arrêt précédent"
@@ -22344,7 +22685,21 @@
 msgstr "Terraserver Urbain"
 
+#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
+#~ msgstr ""
+#~ "Vous pouvez utiliser la souris ou les boutons Ctrl+flèches pour zoomer et "
+#~ "faire glisser."
+
 #~ msgid "Uploading data"
 #~ msgstr "Envoi des données"
 
+#~ msgid "Email"
+#~ msgstr "E-mail"
+
+#~ msgid "Login name (email) to the OSM account."
+#~ msgstr "Nom d’utilisateur (e-mail) du compte OSM."
+
+#~ msgid "OSM username (email)"
+#~ msgstr "Nom d’utilisateur OSM (courriel)"
+
 #~ msgid "Unknown host"
 #~ msgstr "Hôte inconnu"
@@ -22352,4 +22707,11 @@
 #~ msgid "Add either site-josm.xml or Wiki Pages."
 #~ msgstr "Ajouter soit site-josm.xml soit des pages Wiki."
+
+#~ msgid ""
+#~ "Server returned internal error. Try a reduced area or retry after waiting "
+#~ "some time."
+#~ msgstr ""
+#~ "Le serveur a retourné une erreur. Essayez de réduire la taille de la zone "
+#~ "à charger, et/ou attendez un peu avant de recommencer."
 
 #~ msgid "Commit comment"
@@ -22407,6 +22769,67 @@
 #~ msgstr "Marquer ce problème comme \"fait\"?"
 
+#~ 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 URL.<br><b>Do not use a valuable Password.</b></html>"
+#~ msgstr ""
+#~ "<html>ATTENTION : Le mot de passe est stocké en texte brut dans le "
+#~ "fichier de préférences.<br>Le mot de passe est transféré en texte brut au "
+#~ "serveur, encodé dans l’URL.<br><b>N’utilisez pas un mot de passe de "
+#~ "valeur.</b></html>"
+
 #~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS"
 #~ msgstr "Télécharger une image rectifiée sur le WMS Metacarta's Map Rectifer"
+
+#~ msgid ""
+#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab "
+#~ "- these will then show up in the WMS menu.\n"
+#~ "\n"
+#~ "You can also do this manually in the Advanced Preferences, using the "
+#~ "following schema:\n"
+#~ "wmsplugin.url.1.name=Landsat\n"
+#~ "wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n"
+#~ "wmsplugin.url.2.name=NPE Maps... etc\n"
+#~ "\n"
+#~ "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"
+#~ "\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"
+#~ "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"
+#~ "Note: Make sure the image is suitable, copyright-wise, if in doubt, don't "
+#~ "use."
+#~ msgstr ""
+#~ "Vous pouvez ajouter, éditer et supprimer des sources WMS dans l'onglet "
+#~ "Préférences du greffon WMS - elles apparaitront ensuite dans le menu "
+#~ "WMS.\n"
+#~ "\n"
+#~ "Vous pouvez également faire cela manuellement dans les Préférences "
+#~ "avancées, en utilisant le schéma suivant :\n"
+#~ "wmsplugin.url.1.name=Landsat\n"
+#~ "wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n"
+#~ "wmsplugin.url.2.name=NPE Maps... etc\n"
+#~ "\n"
+#~ "Exemple  d'URL WMS complet (landsat)\n"
+#~ "http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n"
+#~ "layers=global_mosaic&styles=&srs=EPSG:4326&\n"
+#~ "format=image/jpeg \n"
+#~ "\n"
+#~ "Pour Metacartas Map Rectifier http://labs.metacarta.com/rectifier/ , vous "
+#~ "devez seulement entrer l' 'id' correspondant.\n"
+#~ "Pour ajouter une entrée Metacarta Map Rectifer dans le menu, créez "
+#~ "manuellement l'URL comme dans cet exemple, en remplaçant 73 par l'id de "
+#~ "votre image : \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"
+#~ "Note : Assurez-vous que l'image est utilisable et sous une licence "
+#~ "compatible. En cas de doute, ne l'utilisez pas."
 
 #~ msgid "Portcullis"
@@ -22434,10 +22857,42 @@
 #~ msgstr "viaduc"
 
+#~ msgid "Open the OpenStreetBugs window and activate the automatic download"
+#~ msgstr ""
+#~ "Ouvrir la fenêtre OpenStreetBugs et activer le téléchargement automatique"
+
 #~ msgid "sports"
 #~ msgstr "Magasin de sport"
 
+#~ msgid ""
+#~ "Lambert zone {0} in cache  incompatible with current Lambert zone {1}"
+#~ msgstr ""
+#~ "Zine Lambert {0} du tampon incompatible avec la zone de Lambert courante "
+#~ "{1}"
+
 #~ msgid "Delete and Download"
 #~ msgstr "Supprimer et télécharger"
 
+#~ msgid "No intersections found. Nothing was changed."
+#~ msgstr "Pas d'intersection trouvée. Rien n'a été modifié."
+
+#~ msgid ""
+#~ "This action will require {0} individual download requests. Do you wish to "
+#~ "continue?"
+#~ msgstr ""
+#~ "Cette action va nécessiter {0} requêtes de téléchargement. Souhaitez-vous "
+#~ "continuer ?"
+
+#~ msgid ""
+#~ "An error occured while trying to match the photos to the GPX track. You "
+#~ "can adjust the sliders to manually match the photos."
+#~ msgstr ""
+#~ "Une erreur est survenue lors de l'association des photos avec la trace "
+#~ "GPX. Vous pouvez ajuster les curseurs pour faire correspondre les photos "
+#~ "manuellement."
+
+#~ msgid "The following errors occured during mass download:"
+#~ msgstr ""
+#~ "Les erreurs suivantes sont survenues durant le téléchargement groupé :"
+
 #~ msgid "Edit Drawbridge"
 #~ msgstr "Modifier un pont-levis"
@@ -22445,4 +22900,14 @@
 #~ msgid "Edit Portcullis"
 #~ msgstr "Modifier une herse"
+
+#~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">english</A>."
+#~ msgstr "Page d’aide manquante. Créez la sur <A HREF=\"{0}\">english</A>."
+
+#~ msgid ""
+#~ "Helppage missing. Create it in <A HREF=\"{0}\">english</A> or <A HREF="
+#~ "\"{1}\">your language</A>."
+#~ msgstr ""
+#~ "Page d’aide manquante. Créez la sur <A HREF=\"{0}\">english</A> ou <A "
+#~ "HREF=\"{1}\">French</A>."
 
 #~ msgid ""
@@ -22468,4 +22933,17 @@
 #~ msgstr "Non initialisé"
 
+#~ msgid "Cannot read numeric value from response"
+#~ msgstr "Impossible de lire une valeur numérique dans la réponse"
+
 #~ msgid "Data upload failed for unknown reason"
 #~ msgstr "L'envoi de données a échoué pour une raison inconnue"
+
+#~ msgid "Resolve conflicts in member list of of relation {0}"
+#~ msgstr "Résoudre les conflits dans la liste des membres de la relation {0}"
+
+#~ msgid ""
+#~ "Properties in the merged element. They will replace properties in my "
+#~ "elements when  merge decisions are applied."
+#~ msgstr ""
+#~ "Propriétés des éléments fusionnés. Elles remplaceront les propriétés des "
+#~ "éléments lorsque les choix de fusion seront appliqués."
Index: applications/editors/josm/i18n/po/gl.po
===================================================================
--- applications/editors/josm/i18n/po/gl.po	(revision 16008)
+++ applications/editors/josm/i18n/po/gl.po	(revision 16009)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-14 16:51+0200\n"
-"PO-Revision-Date: 2009-06-09 18:36+0000\n"
-"Last-Translator: Rafael Ávila Coya <ravila@edu.xunta.es>\n"
+"POT-Creation-Date: 2009-06-19 21:52+0200\n"
+"PO-Revision-Date: 2009-06-18 22:04+0000\n"
+"Last-Translator: foz <Unknown>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-06-14 14:46+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 "Axuda"
 
 #: ../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 ""
 
@@ -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"
@@ -334,5 +336,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:223
 msgid "conflict"
-msgstr "conflicto"
+msgstr "conflito"
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
@@ -365,5 +367,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:81
 msgid "No conflicts to zoom to"
-msgstr "Non hai conflictos sobre os que facer zoom"
+msgstr "Non hai conflitos sobre os que facer zoom"
 
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
@@ -415,5 +417,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:316
 msgid "Enter values for all conflicts."
-msgstr "Introducir valores para todos os conflictos."
+msgstr "Introducir valores para todos os conflitos."
 
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192
@@ -421,5 +423,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:318
 msgid "Solve Conflicts"
-msgstr "Resolver Conflictos"
+msgstr "Resolver Conflitos"
 
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225
@@ -536,5 +538,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}"
@@ -606,6 +608,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:92
-msgid "Email"
-msgstr "Correo Electrónico"
+msgid "E-Mail"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:96
@@ -643,12 +645,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
@@ -675,5 +679,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
@@ -706,13 +710,15 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:207
 #, java-format
-msgid "Helppage missing. Create it in <A HREF=\"{0}\">english</A>."
-msgstr ""
+msgid "Help page missing. Create it in <A HREF=\"{0}\">english</A>."
+msgstr "Páxina de axuda perdida. Créea en <A HREF=\"{0}\">inglés</A>."
 
 #: ../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 ""
+"Páxina de axuda perdida. Créea en <A HREF=\"{0}\">inglés</A> ou <A HREF=\"{1}"
+"\">galego</A>."
 
 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:26
@@ -792,13 +798,13 @@
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:70
 msgid "Mirror"
-msgstr ""
+msgstr "Reflexar"
 
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 msgid "Mirror selected nodes and ways."
-msgstr ""
+msgstr "Reflexar os nodos e vías seleccionados."
 
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53
 msgid "Please select at least one node or way."
-msgstr ""
+msgstr "Por favor, seleccione como mínimo un nodo ou vía."
 
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36
@@ -1034,5 +1040,5 @@
 #, java-format
 msgid "File {0} exists. Overwrite?"
-msgstr ""
+msgstr "O arquivo {0} existe. Sobreescribir?"
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
@@ -1063,5 +1069,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:180
 msgid "Conflicts"
-msgstr "Conflictos"
+msgstr "Conflitos"
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:98
@@ -1070,10 +1076,10 @@
 "if you rejected all. Continue?"
 msgstr ""
-"Hai conflictos sen resolver. Os conflictos non serán gardados e serán "
-"tratados como se os rexeitases todos. Continuar?"
+"Hai conflitos sen resolver. Os conflitos non serán gardados e serán tratados "
+"como se os rexeitases todos. Continuar?"
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99
 msgid "Reject Conflicts and Save"
-msgstr "Rexeitar Conflictos e Gardar"
+msgstr "Rexeitar Conflitos e Gardar"
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:109
@@ -1087,5 +1093,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112
 msgid "Save Layer"
-msgstr ""
+msgstr "Gardar Capa"
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:122
@@ -1147,13 +1153,13 @@
 msgstr "Axda: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:99
 msgid "Status Report"
 msgstr "Informe de Estado"
 
-#: ../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 "Copiar a porta papeis e pechar"
 
-#: ../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
@@ -1352,17 +1358,15 @@
 msgstr "Deseleccionar Todo (Escape)"
 
-#: ../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 "Actualizar Datos"
 
-#: ../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 ""
 "Actualiza a capa de datos actual dende o servidor (descarga de novo os datos)"
 
-#: ../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?"
@@ -1371,88 +1375,290 @@
 "de datos?"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:70
+msgid "Undeleting Way..."
+msgstr "Desfacendo borrado de vía..."
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:133
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:247
+msgid "Yes, undelete them too"
+msgstr "Si, desfacer o borrado de eles tamén"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:248
+msgid "No, cancel operation"
+msgstr "Non, cancelar a operación"
+
+#: ../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 ""
-"Esta acción requerirá {0} peticións de descarga individuais. Queres "
-"continuar?"
-
-#: ../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 ""
+"<html>Hai {0} nodos adicionais usados pola vía {1}<br>que están borrados no "
+"servidor.<br><br>Quere desfacer o borrado de eses nodos tamén?</html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:143
+msgid "Undelete additional nodes?"
+msgstr "Desfacer o borrado de nodos adicionais?"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:170
+#, java-format
+msgid "Checking whether node {0} is gone ..."
+msgstr "Comprobando se o nodo {0} falta ..."
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:203
+msgid "Undeleting relation..."
+msgstr "Desfacendo o borrado da relación.."
+
+#: ../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 "Desfacer o borrado de primitivas dependentes?"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:284
+#, java-format
+msgid "Checking whether primitive {0} is gone ..."
+msgstr "Comprobando se a primitiva {0} falta ..."
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:339
+msgid "Keep mine"
+msgstr "Conservar a miña"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:340
+msgid "Delete mine"
+msgstr "Borrar a miña"
+
+#: ../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 ""
+"<html>A primitiva OSM coa id <strong>{0}</strong> foi borrada<br>no servidor "
+"por outro mapeador.<br><br>Fai click en <strong>{1}</strong> para conservar "
+"a túa primitiva e ignorar o estado de borrado.<br>Á túa primitiva seralle "
+"asignado un novo id.<br>Fai click en <strong>{2}</strong> para aceptar o "
+"estado do servidor e borrar a túa primitiva.<br>Fai click en <strong>{3}</"
+"strong> para cancelar.<br>"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:356
+msgid "Primitive deleted on the server"
+msgstr "Primitiva borrada no servidor"
+
+#. 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 "valor retornado non esperado. Obtívose {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:395
+msgid "Failed to update the selected primitives."
+msgstr "Fallou ao actualizar as primitivas seleccionadas."
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:396
+msgid "Update failed"
+msgstr "Actualización fallida"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:408
+#, java-format
+msgid "Could not find primitive with id {0} in the current dataset"
+msgstr "Non se puido atopar a primitiva coa id {0} no paquete de datos actual"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:409
+msgid "Missing primitive"
+msgstr "Primitiva desaparecida"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:441
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:445
+msgid "Update Selection"
+msgstr "Actualizar Selección"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:443
+msgid "Updates the currently selected primitives from the server"
+msgstr "Actualiza as primitiva seleccionadas actualmente dende o servidor"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:457
+msgid "There are no selected primitives to update."
+msgstr "Non hai primitivas seleccionadas para actualizar."
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:458
+msgid "Selection empty"
+msgstr "Selección valeira"
+
+#: ../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 ""
+"<html>Hai <strong>{0}</strong> primitivas <br>seleccionadas para "
+"actualización individual. Por favor, reduza a selección<br>a un máximo de "
+"{1} primitivas.</html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:476
+msgid "Selection too big"
+msgstr "Selección demasiado grande"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
 msgid "Upload to OSM..."
 msgstr "Subir a OSM..."
 
-#: ../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 "SIbir todos os cambios ó servidor OSM."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:96
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:94
 msgid "Objects to add:"
 msgstr "Obxectos para engadir:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102
 msgid "Objects to modify:"
 msgstr "Obxectos para modificar:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:110
 msgid "Objects to delete:"
 msgstr "Obxectos para borrar:"
 
-#: ../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 "Proporciona un breve comentario para os cambios que vas a subir:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:126
 msgid "Upload these changes?"
 msgstr "Subir estes cambios?"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:130
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
 msgid "Upload Changes"
 msgstr "Subir Cambios"
 
-#: ../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 "Nada que subir. Consigue algún dato antes."
 
-#: ../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 "Hai conflictos sen resolver. Debes resolver estes antes."
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:182
+msgstr "Hai conflitos sen resolver. Debes resolver estes antes."
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:180
 msgid "No changes to upload."
 msgstr "Non hai cambios que subir."
 
-#: ../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
+msgstr "Actualizando"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
+msgid "Updating primitive"
+msgstr "Actualizando primitiva"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:310
+#, java-format
+msgid "Synchronize {0} {1} only"
+msgstr "Sincronizar só {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:355
+msgid "Synchronize entire dataset"
+msgstr "Sincronizar o paquete de datos completo"
+
+#: ../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 ""
+"<html>A actualización <strong>fallou</strong> porque o servidor ten unha "
+"nova versión de un<br>dos teus nodos, vías ou relacións.<br>O conflito foi "
+"causado polo/a <strong>{0}</strong> con id <strong>{1}</strong>,<br>o "
+"servidor ten a versión {2}, a túa versión é a {3}.<br><br>Fai click en "
+"<strong>{4}</strong> para sincronizar só a primitiva conflitiva.<br>Fai "
+"click en <strong>{5}</strong> para sincronizar o paquete de datos local "
+"completo co servidor.<br>Fai click en <strong>{6}</strong> para abortar e "
+"continuar editando.<br></html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:330
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:370
+msgid "Conflict detected"
+msgstr "Detectado un conflito"
+
+#: ../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 ""
+"<html>A subida <strong>fallou</strong> porque o servidor tiña unha versión "
+"máis recente de un<br>dos teus nodos, vías ou relacións.<br><br>Fai click en "
+"<strong>{0}</strong> para sincronizar o paquete de datos local completo co "
+"servidor.<br>Fai click en <strong>{1}</strong> para abortar e continuar "
+"editando.<br></html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:399
+#, java-format
+msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
+msgstr ""
+"Advertencia: cabeceira errónea \"{0}\" non concorda co patrón esperado \"{1}"
+"\""
+
+#: ../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 ""
+"<html>A subida ao servidor <strong>fallou</strong> porque o teu<br>paquete "
+"de datos actual viola a condición previa.<br>A mensaxe de erro é:<br>{0}</"
+"html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:419
+msgid "Precondition violation"
+msgstr "Violación de condición previa"
+
+#: ../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 ""
+"<html>A subida <strong>fallou</strong> porque a primitiva que intentou "
+"borrar<br>no servidor xa está borrada.<br><br>A mensaxe de erro é:<br>{0}</"
+"html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:463
+msgid "Primitive already deleted"
+msgstr "A primitiva xa foi borrada"
+
+#: ../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 ""
@@ -1460,4 +1666,6 @@
 "Check the server URL in your preferences and your internet connection."
 msgstr ""
+"Fallo ao iniciar comunicación co servidor OSM {0}.\n"
+"Comproba o URL do servidor nas preferencias e a túa conexión a internet."
 
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15
@@ -1557,37 +1765,51 @@
 msgstr "Datos GPS en bruto"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:44
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:46
 msgid "Downloading data"
 msgstr "Descargando datos"
 
-#: ../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 "Non se importaron datos."
 
-#: ../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 "Capa de datos {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 "Datos OpenStreetMap"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:37
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:45
 msgid "Data Layer"
 msgstr "Capa de datos"
 
-#: ../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 "Descarga {0} de {1} ({2} restantes)"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:88
-msgid "The following errors occured during mass download:"
-msgstr "Os seguintes erros ocurriron durante a descarga masiva:"
-
-#: ../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 "Ocurriron os seguintes erros durante a descarga masiva:"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:96
 msgid "Errors during Download"
 msgstr "Erros durante a descarga"
+
+#: ../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 "Primitivas borradas ou movidas"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:45
@@ -1640,34 +1862,34 @@
 msgstr "Non se pode engadir un nodo fora do mundo."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:495
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:493
 msgid "Add node"
 msgstr "Engadir nodo"
 
-#: ../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 "Engadir nodo na vía"
 
-#: ../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 "Conectar via existente a nodo"
 
-#: ../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 "Engadir un novo nodo a unha via existente"
 
-#: ../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 "Engadir nodo a vía e conectar"
 
-#: ../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 "Crear novo nodo."
 
-#: ../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 "Seleccionar nodo baixo o cursor."
 
-#: ../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."
@@ -1676,14 +1898,14 @@
 msgstr[1] "Insertar novo nodo en {0} vías."
 
-#: ../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 "Comezar nova vía a partir do último nodo."
 
-#: ../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 "Continuar vía a partir do último nodo."
 
-#: ../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 "Rematar debuxo."
@@ -1835,5 +2057,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:87
 msgid "<b>type=route</b> - key 'type' with value exactly 'route'."
-msgstr ""
+msgstr "<b>type=route</b> - a clave 'type' co valor exacto 'route'"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:88
@@ -1842,4 +2064,6 @@
 "<b>type=</b>, <b>*=*</b>, <b>*=</b>"
 msgstr ""
+"<b>type=*</b> - a clave 'type' con calquer valor. Proba tamén <b>*=value</"
+"b>, <b>type=</b>, <b>*=*</b>, <b>*=</b>"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:89
@@ -1849,5 +2073,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:90
 msgid "<b>foot:</b> - key=foot set to any value."
-msgstr "<b>foot:</b> - clave=foot establecida a calquer valor."
+msgstr "<b>foot:</b> - clave=foot establecida con calquer valor."
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91
@@ -1892,4 +2116,6 @@
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
 msgstr ""
+"<b>child <i>expresión</i></b> - todos os fillos de obxectos que coincidan "
+"coa expresión"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101
@@ -1897,4 +2123,6 @@
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
 msgstr ""
+"<b>parent <i>expr</i></b> - todos os pais de obxectos que coincidan coa "
+"expresión"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
@@ -1971,4 +2199,6 @@
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
 msgstr ""
+"Tipo de primitiva descoñecido: {0}. Os valores permitidos son nodo, vía ou "
+"relación"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:493
@@ -1991,5 +2221,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:592
 msgid "Wrong number of parameters for nodes operator."
-msgstr ""
+msgstr "Número de parámetros incorrecto para o operador nodes."
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:595
@@ -1999,32 +2229,40 @@
 "nodes or range, for example nodes:10-20"
 msgstr ""
+"Valor incorrecto do operador nodes: {0}. O operador nodes espera un número "
+"de nodos ou un rango, por exemplo nodes:10-20"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:602
 #, java-format
 msgid "Incorrect value of id operator: {0}. Number is expected."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:33
+msgstr "Valor incorrecto do operador id: {0}. Espérase un número."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:34
 msgid "Load Selection"
 msgstr "Cargar Selección"
 
-#: ../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 "Contacto {0}..."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:45
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:46
 msgid "Downloading..."
 msgstr "Descargando..."
 
-#: ../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 "Non se puido ler dende a URL: \"{0}\""
 
-#: ../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 "Erro de análise na URL: \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:74
+msgid "Error while communicating with server."
+msgstr "Erro durante a comunicación co servidor."
 
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67
@@ -2083,15 +2321,87 @@
 #, java-format
 msgid "Resolve {0} conflicts in {1} objects"
-msgstr "Solucionar {0} conflictos en {1} obxectos"
-
-#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:44
+msgstr "Solucionar {0} conflitos en {1} obxectos"
+
+#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:54
+#, java-format
+msgid "Resolve conflicts in coordinates in {0}"
+msgstr "Resolver conflitos en coordenadas en {0}"
+
+#. 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 "Borrar {1} {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97
+#, java-format
+msgid "Delete {0} {1}"
+msgstr "Borrar {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153
+msgid "Conflicting relation"
+msgstr "Relación contradictoria"
+
+#: ../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 ""
+"A selección \"{0}\" é usada pola relación \"{1}\" co papel {2}.\n"
+"Borrar da relación?"
+
+#: ../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 "Borrar da relación"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
+#, java-format
+msgid ""
+"Selection \"{0}\" is used by relation \"{1}\".\n"
+"Delete from relation?"
+msgstr ""
+"A selección \"{0}\" é usada pola relación \"{1}\".\n"
+"Borrar da relación?"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:366
+msgid "Split way segment"
+msgstr "Separar segmento de vía"
+
+#. 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 ""
+"Estás a punto de borrar nodos que se atopan fora da área que descargaches."
+"<br>Isto pode causar problemas porque outros obxectos (que non ves) poden "
+"estar usandoos.<br>Queres borralos realmente?"
+
+#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:53
+#, java-format
+msgid "Resolve conflicts in deleted state in {0}"
+msgstr "Resolver conflitos en estado borrado en {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118
+msgid "Move"
+msgstr "Mover"
+
 #: ../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"
@@ -2100,19 +2410,235 @@
 msgstr[1] "nodos"
 
-#: ../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 "Purgando 1 primitiva"
+
+#: ../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 ""
+"Advertencia: Purgando a vía {0} porque o número de nodos caeu por debaixo de "
+"2. Os actuais son {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:52
+#, java-format
+msgid "Resolve conflicts in member list of relation {0}"
+msgstr "Resolver conflitos na lista de membros da relación {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66
+msgid "RemoveRelationMember"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
+msgid "Rotate"
+msgstr "Xirar"
+
+#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88
+msgid "Sequence"
+msgstr "Secuencia"
+
+#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:72
+#, java-format
+msgid "Resolve {0} tag conflicts in {1} {2}"
+msgstr "Resolver {0} conflitos de etiquetas en {1} {2}"
+
+#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:61
+#, java-format
+msgid "Undelete {0} primitives"
+msgstr "Desfacer o borrado de {0} primitivas"
+
+#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:44
+#, java-format
+msgid "Resolve version conflicts for {0} {1}"
+msgstr "Resolver conflitos de versión para {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52
+#, java-format
+msgid "Resolve conflicts in node list of of way {0}"
+msgstr "Resolver conflitos na lista de nodos da vía {0}"
+
+#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
+msgid "Apply?"
+msgstr "Aplicar?"
+
+#: ../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 ""
+"Cando se invirta esta vía, os seguintes cambios en propiedades da vía e nos "
+"seus nodos son suxeridos para manter a consistencia dos datos."
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28
+msgid "Relation"
+msgstr "Relación"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30
+msgid "Old role"
+msgstr "Papel antigo"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:32
+msgid "New role"
+msgstr "Novo papel"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
+msgid "Old key"
+msgstr "Clave antiga"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
+msgid "Old value"
+msgstr "Valor antigo"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
+msgid "New key"
+msgstr "Nova clave"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
+msgid "New value"
+msgstr "Novo valor"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:40
+msgid "Apply selected changes"
+msgstr "Aplicar os cambios seleccionados"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41
+msgid "Don't apply changes"
+msgstr "Non aplicar cambios"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:83
+msgid "Please select which property changes you want to apply."
+msgstr "Por favor, selecciona que cambios de propiedade queres aplicar."
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:96
+msgid "Properties of "
+msgstr "Propiedades de "
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:120
+msgid "Roles in relations referring to"
+msgstr "Papeis nas relacións que fan referencia a"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:136
+msgid "Automatic tag correction"
+msgstr "Corrección"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:314
+#, java-format
+msgid "Malformed config file at lines {0}"
+msgstr "Ficheiro de configuración mal formado nas liñas {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:324
+#, java-format
+msgid "Cannot open preferences directory: {0}"
+msgstr "Non se pode abrir o directorio de preferencias: {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 ""
+"O ficheiro de preferencias contiña erros. Creando copia de seguridade do "
+"antigo a {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:79
+#, java-format
+msgid "Preferences stored on {0}"
+msgstr "Preferencias almacenadas en {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:82
+#, java-format
+msgid "Could not upload preferences. Reason: {0}"
+msgstr "Non se puideron subir as preferencias. Razón: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:93
+msgid "Could not load preferences from server."
+msgstr "Non se puideron cargar as preferencias dende o servidor."
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:34
+msgid "different"
+msgstr "diferente"
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:262
+msgid "deleted"
+msgstr "borrado"
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
+msgid "true"
+msgstr "verdadeiro"
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
+msgid "false"
+msgstr "falso"
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20
+msgid "position"
+msgstr "posición"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30
+msgid "Decimal Degrees"
+msgstr "Grados Decimais"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
+msgid "Degrees Minutes Seconds"
+msgstr "Grados Minutos Segundos"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+msgid "S"
+msgstr "S"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+msgid "N"
+msgstr "N"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+msgid "W"
+msgstr "O"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+msgid "E"
+msgstr "E"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:287
+#, java-format
+msgid "parameter {0} > 0 required. Got {1}."
+msgstr "Requírese o parámetro {0} > 0. Obtívose {1}."
+
+#: ../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 "incompleto"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
+#, java-format
+msgid "Error: {0}"
+msgstr "Erro: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
+#, java-format
+msgid "Warning: {0}"
+msgstr "Advertencia: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7
+msgid "nodes"
+msgstr "nodos"
+
+#: ../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"
 msgid_plural "ways"
 msgstr[0] "vía"
-
-#: ../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
+msgstr[1] "vías"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:8
+msgid "ways"
+msgstr "vías"
+
+#: ../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
@@ -2123,267 +2649,27 @@
 msgstr[1] "relacións"
 
-#: ../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 "Borrar {1} {0}"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97
-#, java-format
-msgid "Delete {0} {1}"
-msgstr "Borrar {0} {1}"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153
-msgid "Conflicting relation"
-msgstr "Relación contradictoria"
-
-#: ../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 ""
-"A selección \"{0}\" é usada pola relación \"{1}\" co papel {2}.\n"
-"Borrar da relación?"
-
-#: ../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 "Borrar da relación"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
-#, java-format
-msgid ""
-"Selection \"{0}\" is used by relation \"{1}\".\n"
-"Delete from relation?"
-msgstr ""
-"A selección \"{0}\" é usada pola relación \"{1}\".\n"
-"Borrar da relación?"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:366
-msgid "Split way segment"
-msgstr "Separar segmento de vía"
-
-#. 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 ""
-"Estás a punto de borrar nodos que se atopan fora da área que descargaches."
-"<br>Isto pode causar problemas porque outros obxectos (que non ves) poden "
-"estar usandoos.<br>Queres borralos realmente?"
-
-#: ../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 "Mover"
-
-#: ../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 "Xirar"
-
-#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88
-msgid "Sequence"
-msgstr "Secuencia"
-
-#: ../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 "Aplicar?"
-
-#: ../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 ""
-"Cando se invirta esta vía, os seguintes cambios en propiedades da vía e nos "
-"seus nodos son suxeridos para manter a consistencia dos datos."
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28
-msgid "Relation"
-msgstr "Relación"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30
-msgid "Old role"
-msgstr "Papel antigo"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:32
-msgid "New role"
-msgstr "Novo papel"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
-msgid "Old key"
-msgstr "Clave antiga"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
-msgid "Old value"
-msgstr "Valor antigo"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
-msgid "New key"
-msgstr "Nova clave"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
-msgid "New value"
-msgstr "Novo valor"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:40
-msgid "Apply selected changes"
-msgstr "Aplicar os cambios seleccionados"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41
-msgid "Don't apply changes"
-msgstr "Non aplicar cambios"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:83
-msgid "Please select which property changes you want to apply."
-msgstr "Por favor, selecciona que cambios de propiedade queres aplicar."
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:96
-msgid "Properties of "
-msgstr "Propiedades de "
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:120
-msgid "Roles in relations referring to"
-msgstr "Papeis nas relacións que fan referencia a"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:136
-msgid "Automatic tag correction"
-msgstr "Corrección"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:314
-#, java-format
-msgid "Malformed config file at lines {0}"
-msgstr "Ficheiro de configuración mal formado nas liñas {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:324
-#, java-format
-msgid "Cannot open preferences directory: {0}"
-msgstr "Non se pode abrir o directorio de preferencias: {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 ""
-"O ficheiro de preferencias contiña erros. Creando copia de seguridade do "
-"antigo a {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:79
-#, java-format
-msgid "Preferences stored on {0}"
-msgstr "Preferencias almacenadas en {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:82
-#, java-format
-msgid "Could not upload preferences. Reason: {0}"
-msgstr "Non se puideron subir as preferencias. Razón: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:93
-msgid "Could not load preferences from server."
-msgstr "Non se puideron cargar as preferencias dende o servidor."
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:34
-msgid "different"
-msgstr "diferente"
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:262
-msgid "deleted"
-msgstr "borrado"
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
-msgid "true"
-msgstr "verdadeiro"
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
-msgid "false"
-msgstr "falso"
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20
-msgid "position"
-msgstr "posición"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30
-msgid "Decimal Degrees"
-msgstr "Grados Decimais"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
-msgid "Degrees Minutes Seconds"
-msgstr "Grados Minutos Segundos"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
-msgid "S"
-msgstr "S"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
-msgid "N"
-msgstr "N"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
-msgid "W"
-msgstr "O"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
-msgid "E"
-msgstr "E"
-
-#: ../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 "incompleto"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
-#, java-format
-msgid "Error: {0}"
-msgstr "Erro: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
-#, java-format
-msgid "Warning: {0}"
-msgstr "Advertencia: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:101
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9
+msgid "relations"
+msgstr "relacións"
+
+#: ../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 "o parámetro \"{0}\" non é un nome de tipo válido, obtivose \"{1}\""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:50
+#, java-format
+msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''"
+msgstr "o parámetro \"{0}\" non é unha clase aceptable, obtivose \"{1}\""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:107
 #, java-format
 msgid "{0} member"
@@ -2397,5 +2683,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:122
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "railway"
 msgstr "Vía férrea"
@@ -2417,4 +2703,67 @@
 msgstr[1] "{0} nodos"
 
+#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:153
+msgid "There's no primitive with version {0} in this history"
+msgstr "Non hai unha primitiva coa versión {0} en este historial"
+
+#: ../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 "Non hai unha versión válida con data \"{0}\" en este historial"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:173
+#, java-format
+msgid "parameter ''{0}'' in range 0..{1} expected, got {2}"
+msgstr "esperábase o parámetro \"{0}\" no rango 0..{1}, obtívose {2}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:179
+msgid "no earliest version found. History is empty."
+msgstr "non se atopou unha versión anterior. O historial está valeiro."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:185
+msgid "no latest version found. History is empty."
+msgstr "non se atopou a última versión. O historial está valeiro."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:21
+msgid "Didn't find an  primitive with id {0} in this dataset"
+msgstr "Non se atopou unha primitiva coa id {0} en este paquete de datos"
+
+#: ../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 ""
+"Non se atopou unha primitiva coa id {0} e versión {1} en este conxunto de "
+"datos"
+
+#: ../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 ""
+"Non se atopou unha primitiva gardada en historial coa id {0} en este "
+"conxunto de datos"
+
+#: ../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 "esperabase o parámetro \"{0}\" > 0, obtívose \"{1}\""
+
+#: ../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 "o parámetro \"{0}\" debe non ser nulo"
+
+#: ../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 ""
+"non se pode comparar a primitiva coa ide \"{0}\" coa primitiva coa id \"{1}\""
+
+#: ../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 "o parámetro {0} non está no rango 0..{1}, obtívose {2}"
+
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:234
 msgid "Area style way is not closed."
@@ -2454,5 +2803,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:589
 msgid "More than one \"via\" found."
-msgstr ""
+msgstr "Atopouse máis de un \"vía\"."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:581
@@ -2477,13 +2826,13 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610
 msgid "No \"via\" node or way found."
-msgstr ""
+msgstr "Ningún nodo o vía \"vía\" atopados."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
-msgstr ""
+msgstr "A vía \"desde\" non comeza ou finaliza en un nodo \"vía\""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:623
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
-msgstr ""
+msgstr "A vía \"ata\" non comeza ou finaliza en un nodo \"vía\"."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635
@@ -2562,5 +2911,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 "fondo"
@@ -2633,8 +2982,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
@@ -2646,7 +2995,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
@@ -2659,6 +3008,6 @@
 msgid "{0} object has conflicts:"
 msgid_plural "{0} objects have conflicts:"
-msgstr[0] "{0} obxecto ten conflictos:"
-msgstr[1] "{0} obxectos teñen conflictos:"
+msgstr[0] "{0} obxecto ten conflitos:"
+msgstr[1] "{0} obxectos teñen conflitos:"
 
 #: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:227
@@ -2753,10 +3102,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 "Nome de usuario"
 
 #: ../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 "Contrasinal"
@@ -2853,22 +3202,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:146
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148
 msgid "File"
 msgstr "Ficheiro"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150
 msgid "View"
 msgstr "Ver"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:149
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151
 msgid "Tools"
 msgstr "Ferramentas"
 
-#: ../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 "Axustes prestablecidos"
 
-#: ../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
@@ -2881,21 +3230,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 "Vista de malla"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:218
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221
 msgid "Toggle Wireframe view"
 msgstr "Cambiar Vista de Malla"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:244
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:247
 msgid "Full Screen"
 msgstr "Pantalla completa"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:246
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:249
 msgid "Toggle Full Screen view"
 msgstr "Cambiar a vista de pantalla completa"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:286
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:289
 msgid "Audio"
 msgstr "Audio"
@@ -2967,6 +3316,6 @@
 msgstr "(sen obxecto)"
 
-#: ../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 "a capa non está na lista."
@@ -2976,9 +3325,9 @@
 msgstr "Contactando co servidor OSM..."
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:104
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:105
 msgid "Error while parsing"
 msgstr "Erro durante a análise"
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:107
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:108
 msgid "File not found"
 msgstr "Ficheiro non atopado"
@@ -3053,5 +3402,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 "Membros"
@@ -3247,5 +3596,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
@@ -3327,5 +3676,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 ""
@@ -3364,5 +3713,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 ""
 
@@ -3416,5 +3765,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 "Papel"
@@ -3518,5 +3867,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
@@ -3551,9 +3900,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73
 msgid "Conflict"
-msgstr "Conflicto"
+msgstr "Conflito"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72
 msgid "Merging conflicts."
-msgstr "Combinando conflictos"
+msgstr "Combinando conflitos"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118
@@ -3563,14 +3912,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:159
 msgid "Resolve Conflicts"
-msgstr "Resolver Conflictos"
+msgstr "Resolver Conflitos"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:161
 msgid "Solve Conflict"
-msgstr "Solucionar Conflicto"
+msgstr "Solucionar Conflito"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:178
 #, java-format
 msgid "Conflicts: {0}"
-msgstr "Conflictos: {0}"
+msgstr "Conflitos: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:129
@@ -3831,5 +4180,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 "Relacións"
@@ -3937,66 +4286,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 "Aplicar Cambios"
 
-#: ../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 "Básico"
 
-#: ../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 "Ocupado por"
 
-#: ../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 "Etiquetas (un valor vacío borra a etiqueta)"
 
-#: ../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 "Mover cara arriba"
 
-#: ../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 "Mover os membros actualmente seleccionados cara arriba"
 
-#: ../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 "Engadir Seleccionados"
 
-#: ../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 "Engadir todos os obxectos seleccionados actualmente como membros"
 
-#: ../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 "Eliminar Seleccionados"
 
-#: ../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 "Eliminar da relación todos os obxectos seleccionados actualmente"
 
-#: ../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 "Mover cara abaixo"
 
-#: ../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 "Mover os membros seleccionados actualmente cara abaixo"
 
-#: ../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 "Eliminar o membro da fila actual desta relación"
 
-#: ../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 "Descargar Membros"
 
-#: ../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 "Descargar todas as vías e nodos incompletos na relación"
@@ -4041,5 +4390,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
@@ -4060,9 +4409,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
@@ -4084,31 +4433,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 "Membros: {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 "Editor de Relación: {0}"
 
-#: ../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 "Houbo conflictos durante a importación."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:539
+msgstr "Houbo conflitos durante a importación."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:555
 msgid "Error parsing server response."
 msgstr "Erro analizando a resposta do servidor."
 
-#: ../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 "Non se pode conectar co servidor."
+
+#: ../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
@@ -4174,18 +4526,18 @@
 msgstr "Fontes de Datos e Tipos"
 
-#: ../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 "Descargar como unha nova capa"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:174
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:173
 msgid "Download Area"
 msgstr "Área de Descarga"
 
-#: ../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 ""
 "Área de descarga demasiado grande; probablemente será rexeitada polo servidor"
 
-#: ../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 ""
@@ -4215,5 +4567,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 "Lugares"
@@ -4260,21 +4612,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 "tipo"
@@ -4314,15 +4666,4 @@
 msgid "Tile Numbers"
 msgstr ""
-
-#: ../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 ""
-"Podes usar o rato ou Ctrl+Teclas de cursor/./ para facer zoom e desprazar"
-
-#. 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 "Mapa"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:98
@@ -4401,5 +4742,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)"
@@ -4515,14 +4856,14 @@
 msgstr "Ficheiros Wave Audio (*.wav)"
 
-#: ../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 "Marcas de audio de {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244
 msgid "Import images"
 msgstr "Importar imaxes"
 
-#: ../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, "
@@ -4531,5 +4872,5 @@
 msgstr[1] "{0} trazados, "
 
-#: ../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, "
@@ -4538,5 +4879,5 @@
 msgstr[1] "{0} rutas, "
 
-#: ../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"
@@ -4545,28 +4886,28 @@
 msgstr[1] "{0} puntos de vía"
 
-#: ../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 "Nome: {0}"
 
-#: ../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 "Descrición: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347
 msgid "Timespan: "
 msgstr "Rango de tempo: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354
 msgid "Length: "
 msgstr "Lonxitude: "
 
-#: ../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 "Convertir en capa de datos"
 
-#: ../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 ""
@@ -4577,11 +4918,11 @@
 "perxudicial.<br>Se desexas subir trazados, mira aqui:"
 
-#: ../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
@@ -4591,29 +4932,29 @@
 msgstr "Convertido de: {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 "Descargar todo o que abarca:"
 
-#: ../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 "{0} metros"
 
-#: ../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 "Área máxima por petición:"
 
-#: ../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 "{0} km cad."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:822
 #, java-format
 msgid ""
@@ -4624,9 +4965,9 @@
 "Desexas<br>continuar?</html>"
 
-#: ../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 "Non hai trazados GPX dispoñibles na capa para asociar ó audio."
 
-#: ../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 "
@@ -4634,5 +4975,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 "
@@ -4642,33 +4983,42 @@
 "correctamente os seus tempos foron omitidos."
 
-#: ../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 "fora da área descargada"
 
-#: ../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 "{0} composto de:"
 
-#: ../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} borrados.)"
 
-#: ../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"
@@ -4676,21 +5026,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"
@@ -4834,5 +5184,5 @@
 "O valor predeterminado aínda descoñecido (o parámetro non se usou ainda)."
 
-#: ../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
@@ -4841,5 +5191,5 @@
 msgstr "Por favor selecciona a fila a editar."
 
-#: ../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
@@ -4847,5 +5197,5 @@
 msgstr "Novo valor para {0}"
 
-#: ../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
@@ -4855,5 +5205,5 @@
 msgstr "Por favor seleccione a fila a borrar."
 
-#: ../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 "Introduce un novo par clave/valor."
@@ -5748,106 +6098,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 "Nome"
@@ -6331,6 +6681,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:36
-msgid "Login name (email) to the OSM account."
-msgstr "Nome de inicio de sesión (correo-e) da conta OSM."
+msgid "Login name (e-mail) to the OSM account."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
@@ -6346,6 +6696,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
-msgid "OSM username (email)"
-msgstr "Nome de usuario OSM (correo-e)"
+msgid "OSM username (e-mail)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
@@ -6356,10 +6706,7 @@
 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 ""
-"<html>ADVERTENCIA: O contrasinal é almacenado en texto plano no ficheiroo de "
-"preferencias.<br>O contrasinal é transferido ó servidor en texto plano, "
-"codificado na URL.<br><b>Non uses un contrasinal valioso.</b></html>"
 
 #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on
@@ -6502,5 +6849,5 @@
 "no teu teclado (p.e. ':'/Dous puntos). Por favor, tampouco as uses, usa no "
 "seu lugar a tecla base (';'/Punto e coma nos teclados norteamericanos, '.'/"
-"Punto nos teclados españois,...). Non facelo así pode causar conflictos dado "
+"Punto nos teclados españois,...). Non facelo así pode causar conflitos dado "
 "que JOSM non ten forma de saber que 'Ctrl+Maiús+.' e 'Ctrl+:' son realmente "
 "a mesma cousa nun teclado español...</p>"
@@ -6525,5 +6872,5 @@
 "automáticamente ós atallos. Para cada un dos catro tipos de atallos hai tres "
 "alternativas. JOSM probará esas alternativas na orde da lista cando se "
-"presente un conflicto. Se todas as alternativas resultan en atallos xa "
+"presente un conflito. Se todas as alternativas resultan en atallos xa "
 "usados, asignará no seu lugar un atallo escollido aleatoriamente.</p>"
 
@@ -6679,6 +7026,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 "Contactando co Servidor OSM..."
@@ -6689,7 +7037,7 @@
 msgstr "Descargando os puntos {0} a {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 "Descargando datos de OSM..."
@@ -6754,15 +7102,14 @@
 msgstr "Fallo de importación NMEA!"
 
-#: ../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 "Esta versión de JOSM é incompatible co servidor configurado."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:207
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172
 #, java-format
 msgid ""
@@ -6773,31 +7120,37 @@
 "acepta {0} a {1}."
 
-#: ../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 "Establecida a comunicación con {0} usando o protocolo da versión {1}"
 
-#: ../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 "Non se pode ler valor numérico da resposta"
-
-#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:351
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298
 msgid "Closing changeset..."
 msgstr "Pechando colección de cambios..."
 
-#: ../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 "Preparando..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:381
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:326
 msgid "Uploading..."
 msgstr "Subindo..."
@@ -6812,25 +7165,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 "Contrasinal ou nome de usuario incorrectos."
 
-#: ../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 "Advertencia: O contrasinal transfírese sen encriptar."
 
-#: ../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 "Gardar usuario e contrasinal (sen encriptar)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:89
 msgid "Enter Password"
 msgstr "Introduce Contrasinal"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
 msgid "Login"
 msgstr "Inicio de sesión"
 
-#: ../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..."
@@ -6841,4 +7194,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."
@@ -6931,9 +7327,23 @@
 msgstr "ID de nodo mal formada"
 
-#: ../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 "Contactando co Servidor..."
 
-#: ../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."
@@ -6942,17 +7352,9 @@
 "internet."
 
-#: ../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 ""
-"O servidor devolveu un erro interno. Intentao cunha área máis reducida ou "
-"logo de esperar un tempo."
-
-#: ../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 ""
 
@@ -6968,5 +7370,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 "Descargar Engadidos"
@@ -7156,9 +7558,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 "Descargar engadidos perdidos"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:128
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:119
 #, java-format
 msgid ""
@@ -7171,6 +7573,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
@@ -7193,35 +7595,35 @@
 msgstr "descoñecido"
 
-#: ../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}: Versión {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 "Engadido empaquetado con JOSM"
 
-#: ../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 "Erro lendo o ficheiro de informaclión de engadido: {0}"
 
-#: ../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 "Isto está despois do fin da grabación"
 
-#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:329
+#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:340
 msgid "Error playing sound"
 msgstr "Erro reproducindo son"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
 msgid "Do nothing"
 msgstr "Non facer nada"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
 msgid "Report Bug"
 msgstr "Informar de Fallo"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:52
 msgid ""
 "An unexpected exception occurred.\n"
@@ -7236,18 +7638,18 @@
 "erro."
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55
 msgid "Unexpected Exception"
 msgstr "Excepción Inesperada"
 
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66
+#, java-format
+msgid "Please report a ticket at {0}"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:67
-#, java-format
-msgid "Please report a ticket at {0}"
+msgid "Include your steps to get to the error (as detailed as possible)!"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:68
-msgid "Include your steps to get to the error (as detailed as possible)!"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69
 msgid ""
 "Try updating to the newest version of JOSM and all plugins before reporting "
@@ -7255,9 +7657,9 @@
 msgstr ""
 
-#: ../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 "Asegúrate de incluir a seguinte información:"
 
-#: ../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 "(O texto xa foi copiado ao teu portapapeis.)"
@@ -7334,5 +7736,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 ""
@@ -7703,5 +8105,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 ""
@@ -7735,5 +8137,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"
@@ -7756,5 +8157,5 @@
 msgstr "Ficheiro de caché da Zona Lambert 4 (.4)"
 
-#: ../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
@@ -7845,6 +8246,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/"
@@ -7922,6 +8323,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
@@ -7929,11 +8330,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 ""
@@ -7950,13 +8351,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 ""
@@ -7977,5 +8378,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 ""
 
@@ -8068,5 +8469,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
@@ -8074,59 +8475,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 "Gardar capa WMS nun ficheiro"
-
-#: ../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 "Cargar capa WMS dende ficheiro"
-
-#: ../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 "Versión de ficheiro WMS non soportado; atopouse {0}, esperabase {1}"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:325
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:335
-msgid "File Format Error"
-msgstr "Erro de Formato de Ficheiro"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:481
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:401
 #, java-format
 msgid ""
@@ -8137,14 +8507,14 @@
 "Crear unha nova."
 
-#: ../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 ""
@@ -8239,11 +8609,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 ""
@@ -8253,5 +8623,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 ""
@@ -8538,4 +8908,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 ""
 
@@ -8847,42 +9221,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 ""
@@ -8939,5 +9313,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 ""
 
@@ -9013,5 +9387,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 "
@@ -9019,9 +9393,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 ""
@@ -9448,5 +9822,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 ""
@@ -9536,5 +9910,5 @@
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:195
-msgid "No intersections found. Nothing was changed."
+msgid "No intersection found. Nothing was changed."
 msgstr ""
 
@@ -10400,19 +10774,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 ""
@@ -10471,5 +10844,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113
 #, java-format
 msgid ""
@@ -10512,4 +10885,29 @@
 msgid "Alpha channel"
 msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
+msgid "Save WMS layer to file"
+msgstr "Gardar capa WMS nun ficheiro"
+
+#: ../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 "Cargar capa WMS dende ficheiro"
+
+#: ../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 "Versión de ficheiro WMS non soportado; atopouse {0}, esperabase {1}"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:335
+msgid "File Format Error"
+msgstr "Erro de Formato de Ficheiro"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:163
@@ -10600,4 +10998,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 ""
@@ -10612,5 +11015,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 ""
 
@@ -10894,5 +11297,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 ""
@@ -11394,5 +11797,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 ""
@@ -11861,7 +12264,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 ""
@@ -12477,10 +12880,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 ""
@@ -12692,7 +13095,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 ""
@@ -13624,5 +14027,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 ""
@@ -13758,5 +14161,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 ""
@@ -13764,5 +14167,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 ""
@@ -13814,11 +14217,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 ""
@@ -13826,5 +14239,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1512
+#: build/trans_presets.java:1513
 msgid "Taxi"
 msgstr ""
@@ -13832,5 +14245,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 ""
@@ -13838,5 +14251,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1519
+#: build/trans_presets.java:1520
 msgid "Airport"
 msgstr ""
@@ -13844,15 +14257,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 ""
@@ -13861,5 +14274,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1532
+#: build/trans_presets.java:1533
 msgid "Accomodation"
 msgstr ""
@@ -13871,5 +14284,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 ""
@@ -13878,15 +14291,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 ""
@@ -13894,20 +14307,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 ""
@@ -13915,10 +14328,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 ""
@@ -13926,30 +14339,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 ""
@@ -13957,10 +14370,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 ""
@@ -13971,5 +14384,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 ""
@@ -13977,5 +14390,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 ""
@@ -13983,5 +14396,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 ""
@@ -13989,61 +14402,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 ""
@@ -14051,9 +14464,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 ""
@@ -14061,10 +14474,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 ""
@@ -14072,20 +14485,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 ""
@@ -14093,10 +14506,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 ""
@@ -14104,20 +14517,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 ""
@@ -14126,11 +14539,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 ""
@@ -14138,10 +14551,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 ""
@@ -14150,10 +14563,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 ""
@@ -14161,25 +14574,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 ""
@@ -14187,5 +14600,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 ""
@@ -14193,5 +14606,5 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1667
 msgid "Information Office"
 msgstr ""
@@ -14199,83 +14612,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 "Mapa"
+
 #. 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 ""
@@ -14283,25 +14693,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 ""
@@ -14310,20 +14720,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 ""
@@ -14332,10 +14742,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 ""
@@ -14343,5 +14753,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 ""
@@ -14349,15 +14759,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 ""
@@ -14365,45 +14775,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 ""
@@ -14411,15 +14821,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 ""
@@ -14427,15 +14837,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 ""
@@ -14449,6 +14859,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 ""
@@ -14824,6 +15234,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
@@ -14856,227 +15266,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 ""
@@ -15115,191 +15525,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 ""
@@ -15307,56 +15717,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 ""
 
 #. 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 ""
 
-#: 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 ""
 
-#: 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 ""
@@ -15364,178 +15774,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 ""
 
 #. item
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:1960
 msgid "Edit Baseball"
 msgstr ""
 
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:1965
 msgid "Basketball"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:1966
 msgid "Edit Basketball"
 msgstr ""
 
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:1971
 msgid "Golf"
 msgstr ""
 
 #. 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 ""
 
 #. item
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:1990
 msgid "Edit Cricket"
 msgstr ""
 
-#: 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 ""
 
 #. item
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2026
 msgid "Edit Rugby"
 msgstr ""
 
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:2031
 msgid "Table Tennis"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2032
 msgid "Edit Table Tennis"
 msgstr ""
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2037
 msgid "Tennis"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2037
+#: build/trans_presets.java:2038
 msgid "Edit Tennis"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2044
+#: build/trans_presets.java:2045
 msgid "Buildings"
 msgstr ""
 
 #. group "Buildings"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2046
 msgid "Building"
 msgstr ""
@@ -15543,5 +15953,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2049
 msgid "Public Building"
 msgstr ""
@@ -15549,10 +15959,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 ""
@@ -15560,10 +15970,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 ""
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2061
 msgid "Embassy"
 msgstr ""
@@ -15571,10 +15981,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 ""
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2066
+#: build/trans_presets.java:2067
 msgid "Courthouse"
 msgstr ""
@@ -15583,10 +15993,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 ""
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2074
 msgid "Prison"
 msgstr ""
@@ -15595,10 +16005,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 ""
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2080
+#: build/trans_presets.java:2081
 msgid "Police"
 msgstr ""
@@ -15608,10 +16018,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 ""
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2089
 msgid "Fire Station"
 msgstr ""
@@ -15620,10 +16030,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 ""
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2096
 msgid "Post Office"
 msgstr ""
@@ -15631,5 +16041,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 ""
@@ -15637,15 +16047,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2103
 msgid "Kindergarten"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2103
+#: build/trans_presets.java:2104
 msgid "Edit Kindergarten"
 msgstr ""
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2108
 msgid "School"
 msgstr ""
@@ -15653,10 +16063,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 ""
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2114
 msgid "University"
 msgstr ""
@@ -15664,10 +16074,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 ""
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2120
 msgid "College"
 msgstr ""
@@ -15675,5 +16085,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 ""
@@ -15681,5 +16091,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2126
+#: build/trans_presets.java:2127
 msgid "Cinema"
 msgstr ""
@@ -15688,10 +16098,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 ""
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2133
+#: build/trans_presets.java:2134
 msgid "Library"
 msgstr ""
@@ -15700,10 +16110,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 ""
 
 #. item "Buildings/Library" text "Name"
-#: build/trans_presets.java:2140
+#: build/trans_presets.java:2141
 msgid "Arts Centre"
 msgstr ""
@@ -15711,10 +16121,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 ""
@@ -15723,10 +16133,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 ""
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2154
 msgid "Place of Worship"
 msgstr ""
@@ -15736,5 +16146,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 ""
@@ -15743,6 +16153,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 ""
@@ -15751,66 +16161,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
-msgid "bahai"
-msgstr ""
-
-#: build/trans_presets.java:2160 build/trans_presets.java:2881
-#: build/trans_presets.java:2890
-msgid "buddhist"
-msgstr ""
-
-#: build/trans_presets.java:2160 build/trans_presets.java:2881
-#: build/trans_presets.java:2890
-msgid "christian"
-msgstr ""
-
-#: build/trans_presets.java:2160 build/trans_presets.java:2881
-#: build/trans_presets.java:2890
-msgid "hindu"
-msgstr ""
-
-#: build/trans_presets.java:2160 build/trans_presets.java:2881
-#: build/trans_presets.java:2890
-msgid "jain"
-msgstr ""
-
-#: build/trans_presets.java:2160 build/trans_presets.java:2881
-#: build/trans_presets.java:2890
-msgid "jewish"
-msgstr ""
-
-#: build/trans_presets.java:2160 build/trans_presets.java:2881
-#: build/trans_presets.java:2890
-msgid "muslim"
-msgstr ""
-
-#: build/trans_presets.java:2160 build/trans_presets.java:2881
-#: build/trans_presets.java:2890
-msgid "sikh"
-msgstr ""
-
-#: build/trans_presets.java:2160 build/trans_presets.java:2881
-#: build/trans_presets.java:2890
-msgid "spiritualist"
-msgstr ""
-
-#: build/trans_presets.java:2160 build/trans_presets.java:2881
-#: build/trans_presets.java:2890
-msgid "taoist"
-msgstr ""
-
-#: build/trans_presets.java:2160 build/trans_presets.java:2881
-#: build/trans_presets.java:2890
-msgid "unitarian"
-msgstr ""
-
-#: build/trans_presets.java:2160 build/trans_presets.java:2881
-#: build/trans_presets.java:2890
-msgid "zoroastrian"
-msgstr ""
-
 #: build/trans_presets.java:2161 build/trans_presets.java:2882
 #: build/trans_presets.java:2891
+msgid "bahai"
+msgstr ""
+
+#: build/trans_presets.java:2161 build/trans_presets.java:2882
+#: build/trans_presets.java:2891
+msgid "buddhist"
+msgstr ""
+
+#: build/trans_presets.java:2161 build/trans_presets.java:2882
+#: build/trans_presets.java:2891
+msgid "christian"
+msgstr ""
+
+#: build/trans_presets.java:2161 build/trans_presets.java:2882
+#: build/trans_presets.java:2891
+msgid "hindu"
+msgstr ""
+
+#: build/trans_presets.java:2161 build/trans_presets.java:2882
+#: build/trans_presets.java:2891
+msgid "jain"
+msgstr ""
+
+#: build/trans_presets.java:2161 build/trans_presets.java:2882
+#: build/trans_presets.java:2891
+msgid "jewish"
+msgstr ""
+
+#: build/trans_presets.java:2161 build/trans_presets.java:2882
+#: build/trans_presets.java:2891
+msgid "muslim"
+msgstr ""
+
+#: build/trans_presets.java:2161 build/trans_presets.java:2882
+#: build/trans_presets.java:2891
+msgid "sikh"
+msgstr ""
+
+#: build/trans_presets.java:2161 build/trans_presets.java:2882
+#: build/trans_presets.java:2891
+msgid "spiritualist"
+msgstr ""
+
+#: build/trans_presets.java:2161 build/trans_presets.java:2882
+#: build/trans_presets.java:2891
+msgid "taoist"
+msgstr ""
+
+#: build/trans_presets.java:2161 build/trans_presets.java:2882
+#: build/trans_presets.java:2891
+msgid "unitarian"
+msgstr ""
+
+#: build/trans_presets.java:2161 build/trans_presets.java:2882
+#: build/trans_presets.java:2891
+msgid "zoroastrian"
+msgstr ""
+
+#: build/trans_presets.java:2162 build/trans_presets.java:2883
+#: build/trans_presets.java:2892
 msgid "Denomination"
 msgstr ""
@@ -15819,81 +16229,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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
@@ -15902,5 +16312,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 ""
@@ -15908,5 +16318,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2169
+#: build/trans_presets.java:2170
 msgid "House number"
 msgstr ""
@@ -15914,20 +16324,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2172
 msgid "House name"
 msgstr ""
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2174
 msgid "City name"
 msgstr ""
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2174
+#: build/trans_presets.java:2175
 msgid "Post code"
 msgstr ""
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2176
 msgid "Country code"
 msgstr ""
@@ -15935,5 +16345,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2179
 msgid "Address Interpolation"
 msgstr ""
@@ -15942,5 +16352,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 ""
@@ -15948,71 +16358,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 ""
 
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2184
 msgid "even"
 msgstr ""
 
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2184
 msgid "all"
 msgstr ""
 
-#: 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 ""
 
 #. group "Man Made"
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2188
 msgid "Works"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2189
 msgid "Edit Works"
 msgstr ""
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2193
 msgid "Tower"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2194
 msgid "Edit Tower"
 msgstr ""
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2198
 msgid "Water Tower"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2199
 msgid "Edit Water Tower"
 msgstr ""
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2203
 msgid "Gasometer"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2204
 msgid "Edit Gasometer"
 msgstr ""
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2207
+#: build/trans_presets.java:2208
 msgid "Lighthouse"
 msgstr ""
@@ -16020,10 +16430,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 ""
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2214
 msgid "Windmill"
 msgstr ""
@@ -16031,10 +16441,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 ""
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2220
 msgid "Pipeline"
 msgstr ""
@@ -16042,10 +16452,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 ""
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2225
+#: build/trans_presets.java:2226
 msgid "Wastewater Plant"
 msgstr ""
@@ -16055,10 +16465,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 ""
@@ -16066,10 +16476,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 ""
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2239
+#: build/trans_presets.java:2240
 msgid "Beacon"
 msgstr ""
@@ -16077,10 +16487,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 ""
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2245
+#: build/trans_presets.java:2246
 msgid "Survey Point"
 msgstr ""
@@ -16088,10 +16498,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 ""
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2252
 msgid "Surveillance"
 msgstr ""
@@ -16099,5 +16509,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 ""
@@ -16105,5 +16515,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2258
+#: build/trans_presets.java:2259
 msgid "Power Generator"
 msgstr ""
@@ -16113,39 +16523,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 ""
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "wind"
 msgstr ""
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "hydro"
 msgstr ""
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "fossil"
 msgstr ""
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "nuclear"
 msgstr ""
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "coal"
 msgstr ""
 
-#: 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 ""
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2268
 msgid "Power Station"
 msgstr ""
@@ -16154,10 +16564,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 ""
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2274
+#: build/trans_presets.java:2275
 msgid "Power Sub Station"
 msgstr ""
@@ -16166,5 +16576,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 ""
@@ -16172,10 +16582,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 ""
@@ -16186,5 +16596,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 ""
@@ -16192,5 +16602,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 ""
@@ -16199,25 +16609,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 ""
 
 #. 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 ""
@@ -16225,20 +16635,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 ""
 
 #. 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 ""
@@ -16247,5 +16657,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 ""
@@ -16253,5 +16663,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 ""
@@ -16259,5 +16669,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 ""
@@ -16265,5 +16675,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 ""
@@ -16271,5 +16681,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 ""
@@ -16277,15 +16687,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 ""
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2328
 msgid "Telephone cards"
 msgstr ""
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2330
 msgid "Recycling"
 msgstr ""
@@ -16294,5 +16704,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 ""
@@ -16300,35 +16710,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 ""
 
 #. 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 ""
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2338
 msgid "Glass"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2339
 msgid "Paper"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2340
 msgid "Scrap Metal"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2342
 msgid "Bench"
 msgstr ""
@@ -16337,20 +16747,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 ""
 
 #. item
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2347
 msgid "Edit Hunting Stand"
 msgstr ""
 
 #. item "Amenities/Hunting Stand" check "Shelter"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2350
 msgid "Hide"
 msgstr ""
 
 #. item "Amenities/Hunting Stand" check "Hide"
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2351
 msgid "Lock"
 msgstr ""
@@ -16358,22 +16768,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 ""
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2351
+#: build/trans_presets.java:2352
 msgid "low"
 msgstr ""
 
-#: build/trans_presets.java:2351
+#: build/trans_presets.java:2352
 msgid "half"
 msgstr ""
 
-#: build/trans_presets.java:2351
+#: build/trans_presets.java:2352
 msgid "full"
 msgstr ""
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2354
 msgid "Fountain"
 msgstr ""
@@ -16382,10 +16792,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 ""
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2361
 msgid "Drinking Water"
 msgstr ""
@@ -16394,10 +16804,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 ""
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2367
+#: build/trans_presets.java:2368
 msgid "Baby Hatch"
 msgstr ""
@@ -16405,25 +16815,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 ""
 
 #. group "Shops"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2377
 msgid "Supermarket"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2378
 msgid "Edit Supermarket"
 msgstr ""
 
 #. item "Shops/Supermarket" text "Name"
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:2382
 msgid "Convenience Store"
 msgstr ""
@@ -16431,10 +16841,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 ""
@@ -16442,10 +16852,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 ""
 
 #. item "Shops/Kiosk" text "Name"
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2394
 msgid "Vending machine"
 msgstr ""
@@ -16453,5 +16863,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 ""
@@ -16459,88 +16869,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 ""
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "public_transport_plans"
 msgstr ""
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "parking_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "food"
 msgstr ""
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "drinks"
 msgstr ""
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "sweets"
 msgstr ""
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "cigarettes"
 msgstr ""
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "photos"
 msgstr ""
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "animal_food"
 msgstr ""
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "news_papers"
 msgstr ""
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "toys"
 msgstr ""
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "stamps"
 msgstr ""
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "SIM-cards"
 msgstr ""
 
-#: 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 ""
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "tampons"
 msgstr ""
 
-#: 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 ""
@@ -16548,10 +16958,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 ""
 
 #. item "Shops/Butcher" text "Name"
-#: build/trans_presets.java:2414
+#: build/trans_presets.java:2415
 msgid "Baker"
 msgstr ""
@@ -16559,10 +16969,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 ""
 
 #. item "Shops/Baker" text "Name"
-#: build/trans_presets.java:2420
+#: build/trans_presets.java:2421
 msgid "Florist"
 msgstr ""
@@ -16570,20 +16980,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 ""
 
 #. 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 ""
@@ -16591,60 +17001,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 ""
 
 #. 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 ""
 
 #. item
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2444
 msgid "Edit Computer Shop"
 msgstr ""
 
 #. item "Shops/Computer" text "Name"
-#: build/trans_presets.java:2447
+#: build/trans_presets.java:2448
 msgid "Electronics"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2448
+#: build/trans_presets.java:2449
 msgid "Edit Electronics Shop"
 msgstr ""
 
 #. 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 ""
 
 #. item
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2459
 msgid "Edit Furniture Shop"
 msgstr ""
 
 #. item "Shops/Furniture" text "Name"
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2463
 msgid "Garden Centre"
 msgstr ""
@@ -16652,10 +17062,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 ""
 
 #. item "Shops/Garden Centre" text "Name"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2469
 msgid "Hardware"
 msgstr ""
@@ -16663,10 +17073,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 ""
 
 #. item "Shops/Hardware" text "Name"
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2475
 msgid "Do-it-yourself-store"
 msgstr ""
@@ -16674,60 +17084,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 ""
 
 #. item
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2482
 msgid "Edit Stationery Shop"
 msgstr ""
 
 #. item "Shops/Stationery" text "Name"
-#: build/trans_presets.java:2485
+#: build/trans_presets.java:2486
 msgid "Hairdresser"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2486
+#: build/trans_presets.java:2487
 msgid "Edit Hairdresser"
 msgstr ""
 
 #. item "Shops/Hairdresser" text "Name"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2491
 msgid "Shoes"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2492
 msgid "Edit Shoe Shop"
 msgstr ""
 
 #. item "Shops/Shoes" text "Name"
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2496
 msgid "Toys"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2497
 msgid "Edit Toy Shop"
 msgstr ""
 
 #. item "Shops/Toys" text "Name"
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2501
 msgid "Video"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2502
 msgid "Edit Video Shop"
 msgstr ""
 
 #. item "Shops/Video" text "Name"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2506
 msgid "Dry Cleaning"
 msgstr ""
@@ -16735,10 +17145,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 ""
 
 #. item "Shops/Dry Cleaning" text "Name"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2512
 msgid "Laundry"
 msgstr ""
@@ -16746,10 +17156,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 ""
 
 #. item "Shops/Laundry" text "Name"
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2518
 msgid "Outdoor"
 msgstr ""
@@ -16757,35 +17167,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 ""
 
 #. item "Shops/Outdoor" text "Name"
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2524
 msgid "Sports"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2525
 msgid "Edit Sports Shop"
 msgstr ""
 
 #. item "Shops/Sports" text "Name"
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2529
 msgid "Optician"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2530
 msgid "Edit Optician"
 msgstr ""
 
 #. item "Shops/Optician" text "Name"
-#: build/trans_presets.java:2535
+#: build/trans_presets.java:2536
 msgid "Cash"
 msgstr ""
 
 #. group "Cash"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2537
 msgid "Bank"
 msgstr ""
@@ -16793,5 +17203,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 ""
@@ -16799,10 +17209,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 ""
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2544
 msgid "Money Exchange"
 msgstr ""
@@ -16810,5 +17220,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 ""
@@ -16816,15 +17226,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 ""
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2557
 msgid "Health"
 msgstr ""
 
 #. group "Health"
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2558
 msgid "Doctors"
 msgstr ""
@@ -16832,20 +17242,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 ""
 
 #. item "Health/Doctors" text "Name"
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2564
 msgid "Dentist"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2565
 msgid "Edit Dentist"
 msgstr ""
 
 #. item "Health/Dentist" text "Name"
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2569
 msgid "Pharmacy"
 msgstr ""
@@ -16853,5 +17263,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 ""
@@ -16859,10 +17269,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 ""
 
 #. item "Health/Pharmacy" text "Name"
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2576
 msgid "Hospital"
 msgstr ""
@@ -16870,10 +17280,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 ""
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2582
 msgid "Emergency Access Point"
 msgstr ""
@@ -16882,5 +17292,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 ""
@@ -16889,20 +17299,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2588
 msgid "Point Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2589
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2591
 msgid "Phone Number"
 msgstr ""
 
 #. 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 ""
@@ -16910,5 +17320,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 ""
@@ -16917,25 +17327,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 ""
 
 #. group "Places"
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2605
 msgid "Continent"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2606
 msgid "Edit Continent"
 msgstr ""
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2611
 msgid "Country"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2612
 msgid "Edit Country"
 msgstr ""
@@ -16943,30 +17353,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 ""
 
 #. item
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2618
 msgid "Edit State"
 msgstr ""
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2622
+#: build/trans_presets.java:2623
 msgid "Region"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2623
+#: build/trans_presets.java:2624
 msgid "Edit Region"
 msgstr ""
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2628
+#: build/trans_presets.java:2629
 msgid "County"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2629
+#: build/trans_presets.java:2630
 msgid "Edit County"
 msgstr ""
@@ -16974,15 +17384,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2635
+#: build/trans_presets.java:2636
 msgid "City"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2636
+#: build/trans_presets.java:2637
 msgid "Edit City"
 msgstr ""
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2641
+#: build/trans_presets.java:2642
 msgid "Town"
 msgstr ""
@@ -16990,10 +17400,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 ""
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2649
 msgid "Suburb"
 msgstr ""
@@ -17001,25 +17411,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 ""
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2656
 msgid "Village"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2657
 msgid "Edit Village"
 msgstr ""
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2662
 msgid "Hamlet"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2663
 msgid "Edit Hamlet"
 msgstr ""
@@ -17027,5 +17437,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2669
 msgid "Locality"
 msgstr ""
@@ -17033,10 +17443,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 ""
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2676
 msgid "Island"
 msgstr ""
@@ -17044,5 +17454,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 ""
@@ -17050,5 +17460,5 @@
 #. item "Places/Island" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2683
+#: build/trans_presets.java:2684
 msgid "Cave Entrance"
 msgstr ""
@@ -17056,10 +17466,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 ""
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2690
 msgid "Peak"
 msgstr ""
@@ -17067,10 +17477,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 ""
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2697
 msgid "Glacier"
 msgstr ""
@@ -17078,10 +17488,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 ""
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2703
+#: build/trans_presets.java:2704
 msgid "Volcano"
 msgstr ""
@@ -17089,70 +17499,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 ""
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2711
+#: build/trans_presets.java:2712
 msgid "Boundaries"
 msgstr ""
 
 #. group "Boundaries"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2713
 msgid "National"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2714
 msgid "Edit National Boundary"
 msgstr ""
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2718
+#: build/trans_presets.java:2719
 msgid "Administrative"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2720
 msgid "Edit Administrative Boundary"
 msgstr ""
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2724
+#: build/trans_presets.java:2725
 msgid "Civil"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2725
+#: build/trans_presets.java:2726
 msgid "Edit Civil Boundary"
 msgstr ""
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2730
+#: build/trans_presets.java:2731
 msgid "Political"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:2732
 msgid "Edit Political Boundary"
 msgstr ""
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2736
+#: build/trans_presets.java:2737
 msgid "National park"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2737
+#: build/trans_presets.java:2738
 msgid "Edit National Park Boundary"
 msgstr ""
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2744
 msgid "Land use"
 msgstr ""
 
 #. group "Land use"
-#: build/trans_presets.java:2744
+#: build/trans_presets.java:2745
 msgid "Tree"
 msgstr ""
@@ -17161,15 +17571,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 ""
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2753
 msgid "Botanical Name"
 msgstr ""
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2755
 msgid "Wood"
 msgstr ""
@@ -17178,5 +17588,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 ""
@@ -17184,17 +17594,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 ""
 
-#: build/trans_presets.java:2760 build/trans_presets.java:2769
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
 msgid "deciduous"
 msgstr ""
 
-#: build/trans_presets.java:2760 build/trans_presets.java:2769
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
 msgid "mixed"
 msgstr ""
 
-#: build/trans_presets.java:2762
+#: build/trans_presets.java:2763
 msgid "Forest"
 msgstr ""
@@ -17203,14 +17613,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 ""
 
-#: build/trans_presets.java:2771
+#: build/trans_presets.java:2772
 msgid "Nature Reserve"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2773
 msgid "Edit Nature Reserve"
 msgstr ""
@@ -17218,25 +17628,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2777
+#: build/trans_presets.java:2778
 msgid "Scree"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:2779
 msgid "Edit Scree"
 msgstr ""
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2783
 msgid "Scrub"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2783
+#: build/trans_presets.java:2784
 msgid "Edit Scrub"
 msgstr ""
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2788
 msgid "Fell"
 msgstr ""
@@ -17244,10 +17654,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 ""
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2794
 msgid "Heath"
 msgstr ""
@@ -17255,5 +17665,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 ""
@@ -17261,5 +17671,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2801
 msgid "Farmyard"
 msgstr ""
@@ -17268,45 +17678,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 ""
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2808
+#: build/trans_presets.java:2809
 msgid "Farmland"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2810
 msgid "Edit Farmland Landuse"
 msgstr ""
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2814
+#: build/trans_presets.java:2815
 msgid "Meadow"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2816
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2820
+#: build/trans_presets.java:2821
 msgid "Vineyard"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2822
 msgid "Edit Vineyard Landuse"
 msgstr ""
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2826
+#: build/trans_presets.java:2827
 msgid "Allotments"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:2828
 msgid "Edit Allotments Landuse"
 msgstr ""
@@ -17314,25 +17724,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2833
+#: build/trans_presets.java:2834
 msgid "Garden"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2835
 msgid "Edit Garden"
 msgstr ""
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2838
+#: build/trans_presets.java:2839
 msgid "Grass"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2839
+#: build/trans_presets.java:2840
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2845
 msgid "Village Green"
 msgstr ""
@@ -17340,10 +17750,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 ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:2852
 msgid "Common"
 msgstr ""
@@ -17351,20 +17761,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 ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2858
 msgid "Park"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:2859
 msgid "Edit Park"
 msgstr ""
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2863
 msgid "Recreation Ground"
 msgstr ""
@@ -17372,5 +17782,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 ""
@@ -17378,15 +17788,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2871
 msgid "Residential area"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2872
 msgid "Edit Residential Landuse"
 msgstr ""
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2877
 msgid "Graveyard"
 msgstr ""
@@ -17394,9 +17804,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 ""
 
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:2885
 msgid "Cemetery"
 msgstr ""
@@ -17404,39 +17814,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 ""
 
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2894
 msgid "Retail"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2895
 msgid "Edit Retail Landuse"
 msgstr ""
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2900
 msgid "Commercial"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2901
 msgid "Edit Commercial Landuse"
 msgstr ""
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2906
 msgid "Industrial"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2906
+#: build/trans_presets.java:2907
 msgid "Edit Industrial Landuse"
 msgstr ""
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2912
 msgid "Railway land"
 msgstr ""
@@ -17444,15 +17854,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 ""
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:2919
 msgid "Military"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2920
 msgid "Edit Military Landuse"
 msgstr ""
@@ -17460,55 +17870,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2925
+#: build/trans_presets.java:2926
 msgid "Construction area"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2927
 msgid "Edit Construction Landuse"
 msgstr ""
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2932
 msgid "Brownfield"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:2933
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2937
+#: build/trans_presets.java:2938
 msgid "Greenfield"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:2939
 msgid "Edit Greenfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:2944
 msgid "Landfill"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:2945
 msgid "Edit Landfill Landuse"
 msgstr ""
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2950
 msgid "Quarry"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2950
+#: build/trans_presets.java:2951
 msgid "Edit Quarry Landuse"
 msgstr ""
 
 #. group "Relations"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2960
 msgid "Multipolygon"
 msgstr ""
@@ -17518,5 +17928,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 ""
@@ -17525,10 +17935,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:2970
 msgid "outer segment"
 msgstr ""
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:2970
+#: build/trans_presets.java:2971
 msgid "inner segment"
 msgstr ""
@@ -17536,5 +17946,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:2974
 msgid "Turn restriction"
 msgstr ""
@@ -17543,5 +17953,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 ""
@@ -17549,34 +17959,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 ""
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_straight_on"
 msgstr ""
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_u_turn"
 msgstr ""
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "only_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "only_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "only_straight_on"
 msgstr ""
@@ -17585,15 +17995,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2983
+#: build/trans_presets.java:2984
 msgid "from way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2985
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2986
 msgid "to way"
 msgstr ""
@@ -17601,5 +18011,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:2988
+#: build/trans_presets.java:2989
 msgid "Route"
 msgstr ""
@@ -17608,5 +18018,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 ""
@@ -17614,5 +18024,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 ""
@@ -17684,5 +18094,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
@@ -17691,17 +18101,17 @@
 msgstr ""
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "bus"
 msgstr ""
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "ski"
 msgstr ""
@@ -17754,5 +18164,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
@@ -17761,13 +18171,13 @@
 msgstr ""
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "hiking"
 msgstr ""
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "detour"
 msgstr ""
@@ -17781,10 +18191,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 ""
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:2997
 msgid "Symbol description"
 msgstr ""
@@ -17792,26 +18202,26 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:2999
+#: build/trans_presets.java:3000
 msgid "Network"
 msgstr ""
 
 #. item "Relations/Route" combo "State"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3003
 msgid "Color (hex)"
 msgstr ""
@@ -17820,30 +18230,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:3006
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3007
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3008
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3009
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3010
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3011
 msgid "backward halt point"
 msgstr ""
@@ -21958,7 +22368,20 @@
 msgstr ""
 
+#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
+#~ msgstr ""
+#~ "Podes usar o rato ou Ctrl+Teclas de cursor/./ para facer zoom e desprazar"
+
 #~ msgid "Uploading data"
 #~ msgstr "Subindo datos"
 
+#~ msgid "Email"
+#~ msgstr "Correo Electrónico"
+
+#~ msgid "Login name (email) to the OSM account."
+#~ msgstr "Nome de inicio de sesión (correo-e) da conta OSM."
+
+#~ msgid "OSM username (email)"
+#~ msgstr "Nome de usuario OSM (correo-e)"
+
 #~ msgid "Unknown host"
 #~ msgstr "Maquina descoñecida"
@@ -21966,4 +22389,11 @@
 #~ msgid "Add either site-josm.xml or Wiki Pages."
 #~ msgstr "Engadir ou site-josm.xml ou as páxinas Wiki."
+
+#~ msgid ""
+#~ "Server returned internal error. Try a reduced area or retry after waiting "
+#~ "some time."
+#~ msgstr ""
+#~ "O servidor devolveu un erro interno. Intentao cunha área máis reducida ou "
+#~ "logo de esperar un tempo."
 
 #~ msgid "{0} Plugin successfully updated. Please restart JOSM."
@@ -21990,4 +22420,14 @@
 #~ msgid "Error deleting plugin file: {0}"
 #~ msgstr "Erro borrando ficheiro de engadido: {0}"
+
+#~ 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 URL.<br><b>Do not use a valuable Password.</b></html>"
+#~ msgstr ""
+#~ "<html>ADVERTENCIA: O contrasinal é almacenado en texto plano no ficheiroo "
+#~ "de preferencias.<br>O contrasinal é transferido ó servidor en texto "
+#~ "plano, codificado na URL.<br><b>Non uses un contrasinal valioso.</b></"
+#~ "html>"
 
 #~ msgid ""
@@ -22012,7 +22452,20 @@
 #~ msgstr "Borrar e Descargar"
 
+#~ msgid ""
+#~ "This action will require {0} individual download requests. Do you wish to "
+#~ "continue?"
+#~ msgstr ""
+#~ "Esta acción requerirá {0} peticións de descarga individuais. Queres "
+#~ "continuar?"
+
+#~ msgid "The following errors occured during mass download:"
+#~ msgstr "Os seguintes erros ocurriron durante a descarga masiva:"
+
 #~ msgid "Not initialized"
 #~ msgstr "Sen inicializar"
 
+#~ msgid "Cannot read numeric value from response"
+#~ msgstr "Non se pode ler valor numérico da resposta"
+
 #~ msgid "Data upload failed for unknown reason"
 #~ msgstr "A subida de datos fallou por causa descoñecida"
Index: applications/editors/josm/i18n/po/he.po
===================================================================
--- applications/editors/josm/i18n/po/he.po	(revision 16008)
+++ applications/editors/josm/i18n/po/he.po	(revision 16009)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-14 16:51+0200\n"
-"PO-Revision-Date: 2009-06-11 08:10+0000\n"
+"POT-Creation-Date: 2009-06-19 21:52+0200\n"
+"PO-Revision-Date: 2009-06-18 07:53+0000\n"
 "Last-Translator: Moshe Sayag <Unknown>\n"
 "Language-Team: Hebrew <he@li.org>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-06-14 14:44+0000\n"
+"X-Launchpad-Export-Date: 2009-06-19 19:33+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 "עזרה"
 
 #: ../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 ""
 
@@ -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"
@@ -529,5 +531,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}"
@@ -597,6 +599,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:92
-msgid "Email"
-msgstr "דוא\"ל"
+msgid "E-Mail"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:96
@@ -634,12 +636,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
@@ -666,5 +670,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
@@ -697,5 +701,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:207
 #, java-format
-msgid "Helppage missing. Create it in <A HREF=\"{0}\">english</A>."
+msgid "Help page missing. Create it in <A HREF=\"{0}\">english</A>."
 msgstr ""
 
@@ -703,5 +707,5 @@
 #, 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 ""
@@ -914,5 +918,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88
 msgid "Please select ways with almost right angles to orthogonalize."
-msgstr ""
+msgstr "בחר דרכים עם זווית כמעט ישרה ליישור"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:95
@@ -1016,5 +1020,5 @@
 #, java-format
 msgid "File {0} exists. Overwrite?"
-msgstr ""
+msgstr "הקובץ {0} כבר קיים. לדרוס אותו?"
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
@@ -1068,5 +1072,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112
 msgid "Save Layer"
-msgstr ""
+msgstr "שמור שכבה"
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:122
@@ -1124,13 +1128,13 @@
 msgstr "עזרה: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:99
 msgid "Status Report"
 msgstr "דו\"ח מצב"
 
-#: ../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 ""
 
-#: ../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
@@ -1315,102 +1319,272 @@
 msgstr ""
 
-#: ../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 "עדכן נתונים"
 
-#: ../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 ""
 
-#: ../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?"
 msgstr ""
 
-#: ../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 "פעולה זו תצריך {0} בקשות הורדה נפרדות. האם אתה רוצה להמשיך?"
-
-#: ../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 "בודק האם נקודה {0} נעלמה..."
+
+#: ../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 "ערך מוחזר לא צפוי. התקבל {0}"
+
+#: ../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 "העלה ל-OSM..."
 
-#: ../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 "העלה את כל השינויים לשרת ה-OSM"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:96
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:94
 msgid "Objects to add:"
 msgstr "פריטים להוספה:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102
 msgid "Objects to modify:"
 msgstr "פריטים לשינוי:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:110
 msgid "Objects to delete:"
 msgstr "פריטים למחיקה:"
 
-#: ../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 "ספק הערה קצרה לשינויים שאתה מעלה:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:126
 msgid "Upload these changes?"
 msgstr "העלה את השינויים האלה?"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:130
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
 msgid "Upload Changes"
 msgstr "העלה שינויים"
 
-#: ../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 "אין מה להעלות. קבל כמה נתונים תחילה."
 
-#: ../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 "ישנן התנגשויות שאינן פתורות. עליך לפתור אותן תחילה."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:182
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:180
 msgid "No changes to upload."
 msgstr "אין שינויים להעלאה."
 
-#: ../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
+msgstr "העלאה"
+
+#: ../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 ""
@@ -1515,37 +1689,51 @@
 msgstr "נתוני GPS גולמיים"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:44
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:46
 msgid "Downloading data"
 msgstr "מוריד נתונים"
 
-#: ../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 "לא יובאו נתונים."
 
-#: ../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 "שכבת נתונים {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 "נתוני OpenStreetMap"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:37
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:45
 msgid "Data Layer"
 msgstr "שכבת נתונים"
 
-#: ../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 "מוריד {0} מ-{1} (נותרו {2})"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:88
-msgid "The following errors occured during mass download:"
-msgstr ""
-
-#: ../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 "שגיאות במהלך הורדה"
+
+#: ../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
@@ -1598,52 +1786,52 @@
 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 "הוסף צומת"
 
-#: ../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 "הוסף צומת לדרך"
 
-#: ../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 "חבר דרך קיימת לצומת"
 
-#: ../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 "הוסף צומת חדש לדרך קיימת"
 
-#: ../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 "הוסף צומת לדרך וחבר"
 
-#: ../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 ""
+msgstr "יוצר נקודה חדשה."
+
+#: ../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 "בחר את הנקודה שמתחת לסמן."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:888
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:910
-msgid "Select node under cursor."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890
 #, java-format
 msgid "Insert new node into way."
 msgid_plural "Insert new node into {0} ways."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "הוסף נקודה חדשה לדרך."
+msgstr[1] "הוסף נקודה חדשה ל-{0} דרכים."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:897
+msgid "Start new way from last node."
+msgstr "התחל דרך חדשה מהנקודה האחרונה."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:899
-msgid "Start new way from last node."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:901
 msgid "Continue way from last node."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:922
+msgstr "המשך דרך מהנקודה האחרונה."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:910
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:920
 msgid "Finish drawing."
-msgstr ""
+msgstr "הפסק לצייר."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77
@@ -1775,17 +1963,17 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:84
 msgid "<b>Baker Street</b> - 'Baker' and 'Street' in any key or name."
-msgstr ""
+msgstr "<b>רחוב אבג</b>-'רחוב' ו'אבג' בכל מפתח או שם."
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:85
 msgid "<b>\"Baker Street\"</b> - 'Baker Street' in any key or name."
-msgstr ""
+msgstr "<b>\"רחוב אבג\"</b>-'רחוב אבג' בכל מפתח או שם."
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:86
 msgid "<b>name:Bak</b> - 'Bak' anywhere in the name."
-msgstr ""
+msgstr "<b>name:אבג</b>-'אבג' איפשהו בשם."
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:87
 msgid "<b>type=route</b> - key 'type' with value exactly 'route'."
-msgstr ""
+msgstr "<b>type=route</b>-מפתח 'type' עם הערך 'route' במדוייק."
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:88
@@ -1794,12 +1982,14 @@
 "<b>type=</b>, <b>*=*</b>, <b>*=</b>"
 msgstr ""
+"<b>type=*</b>-מפתח 'type' עם כל ערך. נסה גם <b>*=value</b>, <b>type=</b>, "
+"<b>*=*</b>, <b>*=</b>"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:89
 msgid "<b>-name:Bak</b> - not 'Bak' in the name."
-msgstr ""
+msgstr "<b>-name:אבג</b>-ללא 'אבג' בשם."
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:90
 msgid "<b>foot:</b> - key=foot set to any value."
-msgstr ""
+msgstr "<b>foot:</b>-מפתח 'foot' עם כל ערך."
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91
@@ -1810,5 +2000,5 @@
 msgid ""
 "<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
-msgstr ""
+msgstr "<b>type:</b>-סוג העצם (<b>נקודה</b>, <b>דרך</b>, <b>יחס</b>)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93
@@ -1826,5 +2016,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:96
 msgid "<b>modified</b> - all changed objects"
-msgstr ""
+msgstr "<b>modified</b>...- כל העצמים ששונו"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97
@@ -1838,5 +2028,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99
 msgid "<b>untagged</b> - all untagged objects"
-msgstr ""
+msgstr "<b>untagged</b> - כל העצמים הלא מתוייגים"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100
@@ -1852,5 +2042,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr ""
+msgstr "השתמש ב-<b>|</b> או <b>OR</b> כדי לחבר ב\"או\" לוגי"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103
@@ -1860,5 +2050,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
-msgstr ""
+msgstr "השתמש ב-<b>(</b> ו <b>)</b> כדי לצרף ביטויים"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114
@@ -1869,5 +2059,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
 msgid "Start Search"
-msgstr ""
+msgstr "התחל חיפוש"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179
@@ -1893,13 +2083,13 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209
 msgid "CS"
-msgstr ""
+msgstr "CS"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209
 msgid "CI"
-msgstr ""
+msgstr "CI"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210
 msgid "RX"
-msgstr ""
+msgstr "RX"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32
@@ -1956,26 +2146,32 @@
 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 "טען בחירה"
 
-#: ../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 "צור קשר עם {0}..."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:45
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:46
 msgid "Downloading..."
 msgstr "מוריד..."
 
-#: ../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 "לא יכול לקרוא מכתובת: \"{0}\""
 
-#: ../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 "שגיאה בניתוח כתובת: \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:74
+msgid "Error while communicating with server."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67
@@ -2036,13 +2232,80 @@
 msgstr "פתור {0} התנגשויות ב{1} עצמים"
 
-#: ../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 "מחק {1}{0}"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97
+#, java-format
+msgid "Delete {0} {1}"
+msgstr "מחק {0}{1}"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153
+msgid "Conflicting relation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147
+#, java-format
+msgid ""
+"Selection \"{0}\" is used by relation \"{1}\" with role {2}.\n"
+"Delete from relation?"
+msgstr ""
+
+#: ../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 ""
+"אתה עומד למחוק נקודות מחוץ לשטח שהורדת.<br>זה עלול לגרום לבעיות כיוון שעצמים "
+"אחרים {שאתה לא רואה) עשויים להשתמש בהם.<br>האם אתה באמת רוצה למחוק?"
+
+#: ../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 "הזז"
+
 #: ../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"
@@ -2051,10 +2314,217 @@
 msgstr[1] "צמתים"
 
-#: ../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 "רצף"
+
+#: ../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 "קובץ תצורה לא תקין בשורות {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:324
+#, java-format
+msgid "Cannot open preferences directory: {0}"
+msgstr "לא ניתן לפתוח את תיקיית ההעדפות: {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 "קובץ המאפיינים מכיל שגיאות. מגבה קובץ ישן ל {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:79
+#, java-format
+msgid "Preferences stored on {0}"
+msgstr "מאפיינים נשמרו ב {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:82
+#, java-format
+msgid "Could not upload preferences. Reason: {0}"
+msgstr "לא יכול להעלות מאפיינים. סיבה: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:93
+msgid "Could not load preferences from server."
+msgstr "לא יכול לטעון מאפיינים משרת."
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:34
+msgid "different"
+msgstr "שונה"
+
+#: ../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 "שגיאה: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
+#, java-format
+msgid "Warning: {0}"
+msgstr "אזהרה: {0}"
+
+#: ../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"
@@ -2063,8 +2533,10 @@
 msgstr[1] "דרכים"
 
-#: ../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
@@ -2075,258 +2547,27 @@
 msgstr[1] "יחסים"
 
-#: ../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 "מחק {1}{0}"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97
-#, java-format
-msgid "Delete {0} {1}"
-msgstr "מחק {0}{1}"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153
-msgid "Conflicting relation"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147
-#, java-format
-msgid ""
-"Selection \"{0}\" is used by relation \"{1}\" with role {2}.\n"
-"Delete from relation?"
-msgstr ""
-
-#: ../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 ""
-"אתה עומד למחוק נקודות מחוץ לשטח שהורדת.<br>זה עלול לגרום לבעיות כיוון שעצמים "
-"אחרים {שאתה לא רואה) עשויים להשתמש בהם.<br>האם אתה באמת רוצה למחוק?"
-
-#: ../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 "הזז"
-
-#: ../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 "רצף"
-
-#: ../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 "קובץ תצורה לא תקין בשורות {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:324
-#, java-format
-msgid "Cannot open preferences directory: {0}"
-msgstr "לא ניתן לפתוח את תיקיית ההעדפות: {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 "קובץ המאפיינים מכיל שגיאות. מגבה קובץ ישן ל {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:79
-#, java-format
-msgid "Preferences stored on {0}"
-msgstr "מאפיינים נשמרו ב {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:82
-#, java-format
-msgid "Could not upload preferences. Reason: {0}"
-msgstr "לא יכול להעלות מאפיינים. סיבה: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:93
-msgid "Could not load preferences from server."
-msgstr "לא יכול לטעון מאפיינים משרת."
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:34
-msgid "different"
-msgstr "שונה"
-
-#: ../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 "שגיאה: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
-#, java-format
-msgid "Warning: {0}"
-msgstr "אזהרה: {0}"
-
-#: ../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"
@@ -2340,5 +2581,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:122
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "railway"
 msgstr "מסילת רכבת"
@@ -2360,4 +2601,62 @@
 msgstr[1] "{0} נקודות"
 
+#: ../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."
@@ -2505,5 +2804,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 "רקע"
@@ -2576,8 +2875,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
@@ -2589,7 +2888,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
@@ -2696,10 +2995,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 "שם משתמש"
 
 #: ../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 "סיסמא"
@@ -2793,22 +3092,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:146
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148
 msgid "File"
 msgstr "קובץ"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150
 msgid "View"
 msgstr "תצוגה"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:149
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151
 msgid "Tools"
 msgstr "כלים"
 
-#: ../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 ""
 
-#: ../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
@@ -2821,21 +3120,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 ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:218
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221
 msgid "Toggle Wireframe view"
 msgstr ""
 
-#: ../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 "שמע"
@@ -2907,6 +3206,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 "השכבה אינה ברשימה."
@@ -2916,9 +3215,9 @@
 msgstr "יוצר קשר עם שרת ה-OSM..."
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:104
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:105
 msgid "Error while parsing"
 msgstr "שגיאה בעת פיענוח"
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:107
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:108
 msgid "File not found"
 msgstr "קובץ לא נמצא"
@@ -2990,5 +3289,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 "חברים"
@@ -3184,5 +3483,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
@@ -3264,5 +3563,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 ""
@@ -3301,5 +3600,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 ""
 
@@ -3353,5 +3652,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 "תפקיד"
@@ -3455,5 +3754,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
@@ -3762,5 +4061,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 "יחסים"
@@ -3865,66 +4164,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 "בסיסי"
 
-#: ../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 "תפוס ע\"י"
 
-#: ../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 "תוויות (ערך ריק מוחק את התווית)"
 
-#: ../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 "הזז את החברים הנבחרים מעלה"
 
-#: ../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 "הוסף את הנבחרים"
 
-#: ../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 "הוסף את כל העצמים הנבחרים כחברים"
 
-#: ../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 "הסרת הנבחרים"
 
-#: ../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 "הסר את כל העצמים הנבחרים מהיחס"
 
-#: ../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 "הזז מטה את החברים שנבחרו"
 
-#: ../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 "הסר את החבר בשורת הטבלה הבחורה מהיחס"
 
-#: ../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 "הורד חברים"
 
-#: ../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 "הורד את כל הדרכים והנקודות הבלתי שלמות ביחס"
@@ -3969,5 +4268,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
@@ -3988,9 +4287,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
@@ -4012,31 +4311,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 "חברים: {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 "ארעו התנגשויות במהלך הייבוא."
 
-#: ../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 "שגיאה בניתוח תשובת השרת."
 
-#: ../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 "לא יכול להתחבר לשרת"
+
+#: ../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
@@ -4101,17 +4403,17 @@
 msgstr "מקורות מידע וסוגים"
 
-#: ../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 "הורדה כשכבה חדשה"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:174
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:173
 msgid "Download Area"
 msgstr "הורדת איזור"
 
-#: ../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 "הורדת איזור גדול מידי; כנראה שתדחה ע\"י השרת"
 
-#: ../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 "הורדת איזור בסדר; כנראה שתתקבל ע\"י השרת"
@@ -4139,5 +4441,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 "מקומות"
@@ -4184,21 +4486,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 "סוג"
@@ -4238,14 +4540,4 @@
 msgid "Tile Numbers"
 msgstr "מספרי משטחים"
-
-#: ../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 "ניתן להשתמש בעכבר או ב- Ctrl+מקשי חיצים/./ למיקוד והזזה."
-
-#. 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 "מפה"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:98
@@ -4324,5 +4616,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)"
@@ -4438,14 +4730,14 @@
 msgstr "קובץ שמע (wav.*)"
 
-#: ../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 "סמן שמע מ {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244
 msgid "Import images"
 msgstr "ייבא תמונות"
 
-#: ../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, "
@@ -4454,5 +4746,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, "
@@ -4461,5 +4753,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"
@@ -4468,28 +4760,28 @@
 msgstr[1] "{0} נקודות דרך"
 
-#: ../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 "שם: {0}"
 
-#: ../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 "תיאור: {0}"
 
-#: ../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 "המר לשכבת נתונים"
 
-#: ../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 ""
@@ -4500,11 +4792,11 @@
 "מסלולים, ראה כאן:"
 
-#: ../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
@@ -4514,29 +4806,29 @@
 msgstr "המר מ: {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 "{0} מטרים"
 
-#: ../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 "{0} קמ\"ר"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:822
 #, java-format
 msgid ""
@@ -4547,9 +4839,9 @@
 "html>"
 
-#: ../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 "
@@ -4557,5 +4849,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 "
@@ -4565,33 +4857,42 @@
 "באופן הגיוני הושמטו."
 
-#: ../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 "{0} מורכב מ-:"
 
-#: ../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} נמחק/ו.)"
 
-#: ../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"
@@ -4599,21 +4900,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"
@@ -4755,5 +5056,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
@@ -4762,5 +5063,5 @@
 msgstr "נא בחר את השורה לעריכה."
 
-#: ../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
@@ -4768,5 +5069,5 @@
 msgstr "ערך חדש עבור {0}"
 
-#: ../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
@@ -4776,5 +5077,5 @@
 msgstr "נא בחר את השורה למחיקה."
 
-#: ../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 "הכנס צמד מפתח\\ערך חדש"
@@ -5651,106 +5952,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 "שם"
@@ -6214,6 +6515,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:36
-msgid "Login name (email) to the OSM account."
-msgstr "שם כניסה (אי-מייל) לחשבון OSM."
+msgid "Login name (e-mail) to the OSM account."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
@@ -6227,6 +6528,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
-msgid "OSM username (email)"
-msgstr "שם משתמש OSM (אי-מייל)"
+msgid "OSM username (e-mail)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
@@ -6237,10 +6538,7 @@
 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 ""
-"<html>הזערה: הסיסמא נשמרת בצורה לא מוצפנת בקובץ המאפיינים.<br>הסיסמא נשלחת "
-"בצורה לא מוצפנת לשרת, מקודדת בכתובת.<br><b>אל תשתמש בסיסמא בעלת ערך.</b></"
-"html>"
 
 #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on
@@ -6532,6 +6830,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 "מתחבר לשרת OSM..."
@@ -6542,7 +6841,7 @@
 msgstr "מוריד נקודות {0} עד {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 "מוריד מידע של OSM..."
@@ -6607,15 +6906,14 @@
 msgstr "יבוא NMEA נכשל!"
 
-#: ../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 ""
@@ -6624,31 +6922,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 ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:351
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298
 msgid "Closing changeset..."
 msgstr ""
 
-#: ../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 "מכין..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:381
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:326
 msgid "Uploading..."
 msgstr "מעלה..."
@@ -6663,25 +6967,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 "סיסמא או שם משתמש שגויים."
 
-#: ../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 "אזהרה: הסיסמא נשלחת בצורה לא מוצפנת."
 
-#: ../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 "שמור את המשתמש והסיסמא (לא מוצפנים)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:89
 msgid "Enter Password"
 msgstr "הכנס סיסמא"
 
-#: ../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..."
@@ -6692,4 +6996,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."
@@ -6782,24 +7129,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 "מתחבר לשרת..."
 
-#: ../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 "לא יכול להתחבר לשרת osm. בדוק את חיבור האינטרנט."
 
-#: ../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 "השרת דיווח על שגיאה פנימית. נסה להקטין את השטח או נסה מחדש מאוחר יותר."
-
-#: ../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 ""
 
@@ -6815,5 +7170,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 ""
@@ -6995,9 +7350,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 "הורד תוספים חסרים"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:128
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:119
 #, java-format
 msgid ""
@@ -7010,6 +7365,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
@@ -7032,35 +7387,35 @@
 msgstr "לא ידוע"
 
-#: ../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}: גירסא {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 "תוסף ארוז עם JOSM"
 
-#: ../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 "שגיאה בקריאת קובץ המידע של התוסף: {0}"
 
-#: ../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 "זה לאחר סיום העריכה"
 
-#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:329
+#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:340
 msgid "Error playing sound"
 msgstr "שגיאה בניגון הצליל"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
 msgid "Do nothing"
 msgstr "אל תעשה כלום"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
 msgid "Report Bug"
 msgstr "דווח על תקלה"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:52
 msgid ""
 "An unexpected exception occurred.\n"
@@ -7074,18 +7429,18 @@
 "האחרונה של JOSM, היה נחמד ודווח על התקלה."
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55
 msgid "Unexpected Exception"
 msgstr "שגיאה בלתי צפויה"
 
-#: ../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 "אנא דווח על {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 "כלול את הצעדים לקבלת השגיאה (בפירוט רב ככל האפשר)!"
 
-#: ../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 "
@@ -7093,9 +7448,9 @@
 msgstr "נסה לעדכן לגירסא האחרונה של JOSM וכל התוספים לפני דיווח על תקלה."
 
-#: ../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 "וודא שכללת את המידע הבא:"
 
-#: ../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 "(הטקסט כבר הועתק ל-clipboard שלך)."
@@ -7179,5 +7534,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 "תיאור"
@@ -7552,5 +7907,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 ""
@@ -7584,5 +7939,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"
@@ -7605,5 +7959,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
@@ -7694,6 +8048,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/"
@@ -7769,6 +8123,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
@@ -7776,11 +8130,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 ""
@@ -7797,13 +8151,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 ""
@@ -7824,5 +8178,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 ""
 
@@ -7915,5 +8269,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
@@ -7921,59 +8275,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 "שמור שכבת WMS לקובץ"
-
-#: ../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 "טען שכבת WMS מקובץ"
-
-#: ../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 "גירסת קובץ WMS לא נתמכת; נמצא {0}, צפי {1}"
-
-#: ../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 ""
@@ -7982,14 +8305,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 ""
@@ -8084,11 +8407,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 "ייבא נתיב משכבת GPX"
 
 #: ../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 "זנח נתיב קיים"
@@ -8098,5 +8421,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 "לא נמצאה שכבת נתוני GPX"
@@ -8383,4 +8706,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 ""
 
@@ -8695,42 +9022,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 "שכבה לעריכת מדידות."
@@ -8787,6 +9114,6 @@
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
-msgid "Open the OpenStreetBugs window and activate the automatic download"
-msgstr "פתח את חלון OpenStreetBugs והפעל את ההורדה האוטומטית"
+msgid "Opens the OpenStreetBugs window and activates the automatic download"
+msgstr ""
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:123
@@ -8861,5 +9188,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 "
@@ -8868,9 +9195,9 @@
 "Firefox לא נמצא. קבע את קובץ ההרצה של Firefox בדף Map Settings של המאפיינים."
 
-#: ../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 +9626,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 +9714,5 @@
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:195
-msgid "No intersections found. Nothing was changed."
+msgid "No intersection found. Nothing was changed."
 msgstr ""
 
@@ -10252,19 +10579,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 "עזרת תוסף WMS"
@@ -10323,5 +10649,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113
 #, java-format
 msgid ""
@@ -10364,4 +10690,29 @@
 msgid "Alpha channel"
 msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
+msgid "Save WMS layer to file"
+msgstr "שמור שכבת WMS לקובץ"
+
+#: ../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 "טען שכבת WMS מקובץ"
+
+#: ../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 "גירסת קובץ WMS לא נתמכת; נמצא {0}, צפי {1}"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:335
+msgid "File Format Error"
+msgstr "שגיאה בפורמט קובץ"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:163
@@ -10454,4 +10805,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 ""
@@ -10466,5 +10822,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 ""
 
@@ -10748,5 +11104,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 "התייחסות"
@@ -11248,5 +11604,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 ""
@@ -11715,7 +12071,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 "סוג"
@@ -12331,10 +12687,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 "מפעיל"
@@ -12546,7 +12902,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 "הגבהה"
@@ -13478,5 +13834,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 ""
@@ -13612,5 +13968,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 ""
@@ -13618,5 +13974,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 ""
@@ -13668,11 +14024,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 ""
@@ -13680,5 +14046,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1512
+#: build/trans_presets.java:1513
 msgid "Taxi"
 msgstr "מונית"
@@ -13686,5 +14052,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 "ערוך תחנת מוניות"
@@ -13692,5 +14058,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1519
+#: build/trans_presets.java:1520
 msgid "Airport"
 msgstr "שדה תעופה"
@@ -13698,15 +14064,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 ""
@@ -13715,5 +14081,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1532
+#: build/trans_presets.java:1533
 msgid "Accomodation"
 msgstr "לינה"
@@ -13725,5 +14091,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 "מלון"
@@ -13732,15 +14098,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 ""
@@ -13748,20 +14114,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 ""
@@ -13769,10 +14135,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 ""
@@ -13780,30 +14146,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 ""
@@ -13811,10 +14177,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 "מזון ושתיה"
@@ -13825,5 +14191,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 "מסעדה"
@@ -13831,5 +14197,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 ""
@@ -13837,5 +14203,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 ""
@@ -13843,61 +14209,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 "מזון מהיר"
@@ -13905,9 +14271,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 "בית קפה"
@@ -13915,10 +14281,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 "פאב"
@@ -13926,20 +14292,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 "בר"
@@ -13947,10 +14313,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 "מועדון לילה"
@@ -13958,20 +14324,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 ""
@@ -13980,11 +14346,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 "מוזיאון"
@@ -13992,10 +14358,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 "גן חיות"
@@ -14004,10 +14370,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 "נקודת תצפית"
@@ -14015,25 +14381,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 "יצירת אומנות"
@@ -14041,5 +14407,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 "ערוך יצירת אומנות"
@@ -14047,5 +14413,5 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1667
 msgid "Information Office"
 msgstr ""
@@ -14053,83 +14419,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 "מפה"
+
 #. 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 "ערוך מקלט"
@@ -14137,25 +14500,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 "טירה"
@@ -14164,20 +14527,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 "אתר ארכיאולוגי"
@@ -14186,10 +14549,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 "שדה קרב"
@@ -14197,5 +14560,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 "ערוך שדה קרב"
@@ -14203,15 +14566,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 "מצבת זיכרון"
@@ -14219,45 +14582,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 "מגרש משחקים"
@@ -14265,15 +14628,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 "ערוך דייג"
@@ -14281,15 +14644,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 "ערוך איצטדיון"
@@ -14303,6 +14666,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 "בחר ענף ספורט:"
@@ -14678,6 +15041,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
@@ -14710,227 +15073,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 ""
@@ -14969,191 +15332,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 "סקי"
@@ -15161,56 +15524,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 "קושי"
 
 #. 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 "קל"
 
-#: 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 "מקצוענים"
 
-#: 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 "ירי"
@@ -15218,178 +15581,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 "כדור בסיס"
 
 #. item
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:1960
 msgid "Edit Baseball"
 msgstr "ערוך כדור בסיס"
 
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:1965
 msgid "Basketball"
 msgstr "כדורסל"
 
 #. item
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:1966
 msgid "Edit Basketball"
 msgstr "ערוך כדורסל"
 
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:1971
 msgid "Golf"
 msgstr "גולף"
 
 #. 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 ""
 
 #. item
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:1990
 msgid "Edit Cricket"
 msgstr ""
 
-#: 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 "רוגבי"
 
 #. item
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2026
 msgid "Edit Rugby"
 msgstr "ערוך רוגבי"
 
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:2031
 msgid "Table Tennis"
 msgstr "טניס שולחן"
 
 #. item
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2032
 msgid "Edit Table Tennis"
 msgstr "ערוך טניס שולחן"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2037
 msgid "Tennis"
 msgstr "טניס"
 
 #. item
-#: build/trans_presets.java:2037
+#: build/trans_presets.java:2038
 msgid "Edit Tennis"
 msgstr "ערוך טניס"
 
 #. <separator/>
-#: build/trans_presets.java:2044
+#: build/trans_presets.java:2045
 msgid "Buildings"
 msgstr "מבנים"
 
 #. group "Buildings"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2046
 msgid "Building"
 msgstr "מבנה"
@@ -15397,5 +15760,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2049
 msgid "Public Building"
 msgstr "מבנה ציבור"
@@ -15403,10 +15766,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 "בניין העירייה"
@@ -15414,10 +15777,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 "ערוך בניין העירייה"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2061
 msgid "Embassy"
 msgstr "שגרירות"
@@ -15425,10 +15788,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 "ערוך שגרירות"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2066
+#: build/trans_presets.java:2067
 msgid "Courthouse"
 msgstr "בית משפט"
@@ -15437,10 +15800,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 "ערוך בית משפט"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2074
 msgid "Prison"
 msgstr "כלא"
@@ -15449,10 +15812,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 "ערוך כלא"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2080
+#: build/trans_presets.java:2081
 msgid "Police"
 msgstr "משטרה"
@@ -15462,10 +15825,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 "ערוך משטרה"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2089
 msgid "Fire Station"
 msgstr "תחנת מכבי אש"
@@ -15474,10 +15837,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 "ערוך תחנת מכבי אש"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2096
 msgid "Post Office"
 msgstr "דואר"
@@ -15485,5 +15848,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 "ערוך דואר"
@@ -15491,15 +15854,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2103
 msgid "Kindergarten"
 msgstr "גן ילדים"
 
 #. item
-#: build/trans_presets.java:2103
+#: build/trans_presets.java:2104
 msgid "Edit Kindergarten"
 msgstr "ערוך גן ילדים"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2108
 msgid "School"
 msgstr "בית ספר"
@@ -15507,10 +15870,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 "ערוך בית ספר"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2114
 msgid "University"
 msgstr "אוניברסיטה"
@@ -15518,10 +15881,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 "ערוך אוניברסיטה"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2120
 msgid "College"
 msgstr "מכללה"
@@ -15529,5 +15892,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 "ערוך מכללה"
@@ -15535,5 +15898,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2126
+#: build/trans_presets.java:2127
 msgid "Cinema"
 msgstr "קולנוע"
@@ -15542,10 +15905,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 "ערוך קולנוע"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2133
+#: build/trans_presets.java:2134
 msgid "Library"
 msgstr "ספרייה"
@@ -15554,10 +15917,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 "ערוך ספרייה"
 
 #. item "Buildings/Library" text "Name"
-#: build/trans_presets.java:2140
+#: build/trans_presets.java:2141
 msgid "Arts Centre"
 msgstr "מרכז אומנויות"
@@ -15565,10 +15928,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 "תיאטרון"
@@ -15577,10 +15940,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 "ערוך תיאטרון"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2154
 msgid "Place of Worship"
 msgstr "מקום תפילה"
@@ -15590,5 +15953,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 "ערוך מקום תפילה"
@@ -15597,6 +15960,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 "דת"
@@ -15605,66 +15968,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 "בודהיסט"
 
-#: 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 "נוצרי"
 
-#: 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 "הינדי"
 
-#: 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 "יהודי"
 
-#: 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 "מוסלמי"
 
-#: 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 "סיקי"
 
-#: 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 "ספיריטואליסט"
 
-#: 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 "טאואיסט"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2881
-#: build/trans_presets.java:2890
-msgid "unitarian"
-msgstr ""
-
-#: build/trans_presets.java:2160 build/trans_presets.java:2881
-#: build/trans_presets.java:2890
-msgid "zoroastrian"
-msgstr ""
-
 #: build/trans_presets.java:2161 build/trans_presets.java:2882
 #: build/trans_presets.java:2891
+msgid "unitarian"
+msgstr ""
+
+#: build/trans_presets.java:2161 build/trans_presets.java:2882
+#: build/trans_presets.java:2891
+msgid "zoroastrian"
+msgstr ""
+
+#: build/trans_presets.java:2162 build/trans_presets.java:2883
+#: build/trans_presets.java:2892
 msgid "Denomination"
 msgstr ""
@@ -15673,81 +16036,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 "אנגליקני"
 
-#: 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 "באפטיסט"
 
-#: 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 "קתולי"
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 "לותרני"
 
-#: 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 "מתודיסט"
 
-#: 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 "מורמוני"
 
-#: 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 "אורתודוקסי"
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 "פרוטסטנטי"
 
-#: 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 ""
 
-#: 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 "כתובות"
@@ -15756,5 +16119,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 "ערוך כתובת"
@@ -15762,5 +16125,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2169
+#: build/trans_presets.java:2170
 msgid "House number"
 msgstr "מספר בית"
@@ -15768,20 +16131,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2172
 msgid "House name"
 msgstr "שם בית"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2174
 msgid "City name"
 msgstr "שם עיר"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2174
+#: build/trans_presets.java:2175
 msgid "Post code"
 msgstr "מיקוד"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2176
 msgid "Country code"
 msgstr "קוד מדינה"
@@ -15789,5 +16152,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2179
 msgid "Address Interpolation"
 msgstr ""
@@ -15796,5 +16159,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 ""
@@ -15802,71 +16165,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 "אי-זוגי"
 
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2184
 msgid "even"
 msgstr "זוגי"
 
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2184
 msgid "all"
 msgstr "הכל"
 
-#: 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 "מעשה אדם"
 
 #. group "Man Made"
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2188
 msgid "Works"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2189
 msgid "Edit Works"
 msgstr ""
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2193
 msgid "Tower"
 msgstr "מגדל"
 
 #. item
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2194
 msgid "Edit Tower"
 msgstr "ערוך מגדל"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2198
 msgid "Water Tower"
 msgstr "מגדל מים"
 
 #. item
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2199
 msgid "Edit Water Tower"
 msgstr "ערוך מגדל מים"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2203
 msgid "Gasometer"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2204
 msgid "Edit Gasometer"
 msgstr ""
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2207
+#: build/trans_presets.java:2208
 msgid "Lighthouse"
 msgstr "מגדלור"
@@ -15874,10 +16237,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 "ערוך מגדלור"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2214
 msgid "Windmill"
 msgstr "טחנת רוח"
@@ -15885,10 +16248,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 "ערוך טחנת רוח"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2220
 msgid "Pipeline"
 msgstr "צינור"
@@ -15896,10 +16259,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 "ערוך צינור"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2225
+#: build/trans_presets.java:2226
 msgid "Wastewater Plant"
 msgstr ""
@@ -15909,10 +16272,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 ""
@@ -15920,10 +16283,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 ""
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2239
+#: build/trans_presets.java:2240
 msgid "Beacon"
 msgstr ""
@@ -15931,10 +16294,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 ""
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2245
+#: build/trans_presets.java:2246
 msgid "Survey Point"
 msgstr ""
@@ -15942,10 +16305,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 ""
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2252
 msgid "Surveillance"
 msgstr ""
@@ -15953,5 +16316,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 ""
@@ -15959,5 +16322,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2258
+#: build/trans_presets.java:2259
 msgid "Power Generator"
 msgstr ""
@@ -15967,39 +16330,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 ""
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "wind"
 msgstr ""
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "hydro"
 msgstr ""
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "fossil"
 msgstr ""
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "nuclear"
 msgstr ""
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "coal"
 msgstr ""
 
-#: 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 ""
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2268
 msgid "Power Station"
 msgstr "תחנת כח"
@@ -16008,10 +16371,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 "ערוך תחנת כח"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2274
+#: build/trans_presets.java:2275
 msgid "Power Sub Station"
 msgstr ""
@@ -16020,5 +16383,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 ""
@@ -16026,10 +16389,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 "עמוד חשמל"
@@ -16040,5 +16403,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 "ערוך עמוד חשמל"
@@ -16046,5 +16409,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 "קו מתח"
@@ -16053,25 +16416,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 ""
 
 #. 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 "שירותים"
@@ -16079,20 +16442,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 ""
 
 #. 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 "טלפון"
@@ -16101,5 +16464,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 "ערוך טלפון"
@@ -16107,5 +16470,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 ""
@@ -16113,5 +16476,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 ""
@@ -16119,5 +16482,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 ""
@@ -16125,5 +16488,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 ""
@@ -16131,15 +16494,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 ""
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2328
 msgid "Telephone cards"
 msgstr "כרטיסי טלפון"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2330
 msgid "Recycling"
 msgstr ""
@@ -16148,5 +16511,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 "ערוך תחנת מיחזור"
@@ -16154,35 +16517,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 ""
 
 #. 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 ""
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2338
 msgid "Glass"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2339
 msgid "Paper"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2340
 msgid "Scrap Metal"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2342
 msgid "Bench"
 msgstr "ספסל"
@@ -16191,20 +16554,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 ""
 
 #. item
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2347
 msgid "Edit Hunting Stand"
 msgstr ""
 
 #. item "Amenities/Hunting Stand" check "Shelter"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2350
 msgid "Hide"
 msgstr ""
 
 #. item "Amenities/Hunting Stand" check "Hide"
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2351
 msgid "Lock"
 msgstr ""
@@ -16212,22 +16575,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 ""
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2351
+#: build/trans_presets.java:2352
 msgid "low"
 msgstr ""
 
-#: build/trans_presets.java:2351
+#: build/trans_presets.java:2352
 msgid "half"
 msgstr ""
 
-#: build/trans_presets.java:2351
+#: build/trans_presets.java:2352
 msgid "full"
 msgstr ""
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2354
 msgid "Fountain"
 msgstr "מזרקה"
@@ -16236,10 +16599,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 "ערוך מזרקה"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2361
 msgid "Drinking Water"
 msgstr "מי שתיה"
@@ -16248,10 +16611,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 "ערוך מי שתיה"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2367
+#: build/trans_presets.java:2368
 msgid "Baby Hatch"
 msgstr ""
@@ -16259,25 +16622,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 "חנויות"
 
 #. group "Shops"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2377
 msgid "Supermarket"
 msgstr "סופרמרקט"
 
 #. item
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2378
 msgid "Edit Supermarket"
 msgstr "ערוך סופרמרקט"
 
 #. item "Shops/Supermarket" text "Name"
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:2382
 msgid "Convenience Store"
 msgstr "מכולת"
@@ -16285,10 +16648,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 "קיוסק"
@@ -16296,10 +16659,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 "ערוך קיוסק"
 
 #. item "Shops/Kiosk" text "Name"
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2394
 msgid "Vending machine"
 msgstr "מכונת ממכר"
@@ -16307,5 +16670,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 "ערוך מכונת ממכר"
@@ -16313,88 +16676,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 "כרטיסים לתחבורה ציבורית"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "public_transport_plans"
 msgstr "מפות תחבורה ציבורית"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "parking_tickets"
 msgstr "כרטיסי חניה"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "food"
 msgstr "מזון"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "drinks"
 msgstr "משקאות"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "sweets"
 msgstr "ממתקים"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "cigarettes"
 msgstr "סיגריות"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "photos"
 msgstr "תמונות"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "animal_food"
 msgstr "מזון בע\"ח"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "news_papers"
 msgstr "עיתונים"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "toys"
 msgstr "צעצועים"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "stamps"
 msgstr "בולים"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "SIM-cards"
 msgstr "כרטיס SIM"
 
-#: 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 "קונדומים"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "tampons"
 msgstr "טמפונים"
 
-#: 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 "קצבייה"
@@ -16402,10 +16765,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 "ערוך קצבייה"
 
 #. item "Shops/Butcher" text "Name"
-#: build/trans_presets.java:2414
+#: build/trans_presets.java:2415
 msgid "Baker"
 msgstr "מאפייה"
@@ -16413,10 +16776,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 "ערוך מאפייה"
 
 #. item "Shops/Baker" text "Name"
-#: build/trans_presets.java:2420
+#: build/trans_presets.java:2421
 msgid "Florist"
 msgstr "פרחים"
@@ -16424,20 +16787,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 "ערוך חנות פרחים"
 
 #. 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 ""
@@ -16445,60 +16808,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 ""
 
 #. 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 ""
 
 #. item
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2444
 msgid "Edit Computer Shop"
 msgstr "ערוך חנות מחשבים"
 
 #. item "Shops/Computer" text "Name"
-#: build/trans_presets.java:2447
+#: build/trans_presets.java:2448
 msgid "Electronics"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2448
+#: build/trans_presets.java:2449
 msgid "Edit Electronics Shop"
 msgstr "ערוך חנות אלקטרוניקה"
 
 #. 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 ""
 
 #. item
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2459
 msgid "Edit Furniture Shop"
 msgstr "ערוך חנות רהיטים"
 
 #. item "Shops/Furniture" text "Name"
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2463
 msgid "Garden Centre"
 msgstr ""
@@ -16506,10 +16869,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 ""
 
 #. item "Shops/Garden Centre" text "Name"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2469
 msgid "Hardware"
 msgstr ""
@@ -16517,10 +16880,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 ""
 
 #. item "Shops/Hardware" text "Name"
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2475
 msgid "Do-it-yourself-store"
 msgstr "חנות עשה-זאת-בעצמך"
@@ -16528,60 +16891,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 ""
 
 #. item
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2482
 msgid "Edit Stationery Shop"
 msgstr ""
 
 #. item "Shops/Stationery" text "Name"
-#: build/trans_presets.java:2485
+#: build/trans_presets.java:2486
 msgid "Hairdresser"
 msgstr "מספרה"
 
 #. item
-#: build/trans_presets.java:2486
+#: build/trans_presets.java:2487
 msgid "Edit Hairdresser"
 msgstr "ערוך מספרה"
 
 #. item "Shops/Hairdresser" text "Name"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2491
 msgid "Shoes"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2492
 msgid "Edit Shoe Shop"
 msgstr "ערוך חנות נעליים"
 
 #. item "Shops/Shoes" text "Name"
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2496
 msgid "Toys"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2497
 msgid "Edit Toy Shop"
 msgstr "ערוך חנות צעצועים"
 
 #. item "Shops/Toys" text "Name"
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2501
 msgid "Video"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2502
 msgid "Edit Video Shop"
 msgstr "ערוך חנות וידאו"
 
 #. item "Shops/Video" text "Name"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2506
 msgid "Dry Cleaning"
 msgstr "ניקוי יבש"
@@ -16589,10 +16952,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 "ערוך ניקוי יבש"
 
 #. item "Shops/Dry Cleaning" text "Name"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2512
 msgid "Laundry"
 msgstr "מכבסה"
@@ -16600,10 +16963,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 "ערוך מכבסה"
 
 #. item "Shops/Laundry" text "Name"
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2518
 msgid "Outdoor"
 msgstr ""
@@ -16611,35 +16974,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 ""
 
 #. item "Shops/Outdoor" text "Name"
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2524
 msgid "Sports"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2525
 msgid "Edit Sports Shop"
 msgstr "ערוך חנות ספורט"
 
 #. item "Shops/Sports" text "Name"
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2529
 msgid "Optician"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2530
 msgid "Edit Optician"
 msgstr "ערוך אופטיקאי"
 
 #. item "Shops/Optician" text "Name"
-#: build/trans_presets.java:2535
+#: build/trans_presets.java:2536
 msgid "Cash"
 msgstr "מזומן"
 
 #. group "Cash"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2537
 msgid "Bank"
 msgstr "בנק"
@@ -16647,5 +17010,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 "ערוך בנק"
@@ -16653,10 +17016,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 "כספומט"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2544
 msgid "Money Exchange"
 msgstr "החלפת כסף"
@@ -16664,5 +17027,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 "ערוך החלפת כסף"
@@ -16670,15 +17033,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 "ערוך כספומט"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2557
 msgid "Health"
 msgstr "בריאות"
 
 #. group "Health"
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2558
 msgid "Doctors"
 msgstr "רופאים"
@@ -16686,20 +17049,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 "ערוך רופאים"
 
 #. item "Health/Doctors" text "Name"
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2564
 msgid "Dentist"
 msgstr "רופא שיניים"
 
 #. item
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2565
 msgid "Edit Dentist"
 msgstr "ערוך רופא שיניים"
 
 #. item "Health/Dentist" text "Name"
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2569
 msgid "Pharmacy"
 msgstr "בית מרקחת"
@@ -16707,5 +17070,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 "ערוך בית מרקחת"
@@ -16713,10 +17076,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 ""
 
 #. item "Health/Pharmacy" text "Name"
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2576
 msgid "Hospital"
 msgstr "בית חולים"
@@ -16724,10 +17087,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 "ערוך בית חולים"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2582
 msgid "Emergency Access Point"
 msgstr "נקודת גישה בחירום"
@@ -16736,5 +17099,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 "ערוך נקודת גישה בחירום"
@@ -16743,20 +17106,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2588
 msgid "Point Number"
 msgstr "מספר נקודה"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2589
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2591
 msgid "Phone Number"
 msgstr "מספר טלפון"
 
 #. 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 "(השתמש בקדומת בינלאומית, למשל +12-345-67890)"
@@ -16764,5 +17127,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 "וטרינרי"
@@ -16771,25 +17134,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 "ערוך וטרינרי"
 
 #. group "Places"
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2605
 msgid "Continent"
 msgstr "יבשת"
 
 #. item
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2606
 msgid "Edit Continent"
 msgstr "ערוך יבשת"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2611
 msgid "Country"
 msgstr "ארץ"
 
 #. item
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2612
 msgid "Edit Country"
 msgstr "ערוך ארץ"
@@ -16797,30 +17160,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 "מדינה"
 
 #. item
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2618
 msgid "Edit State"
 msgstr "ערוך מדינה"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2622
+#: build/trans_presets.java:2623
 msgid "Region"
 msgstr "אזור"
 
 #. item
-#: build/trans_presets.java:2623
+#: build/trans_presets.java:2624
 msgid "Edit Region"
 msgstr "ערוך אזור"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2628
+#: build/trans_presets.java:2629
 msgid "County"
 msgstr "מחוז"
 
 #. item
-#: build/trans_presets.java:2629
+#: build/trans_presets.java:2630
 msgid "Edit County"
 msgstr "ערוך מחוז"
@@ -16828,15 +17191,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2635
+#: build/trans_presets.java:2636
 msgid "City"
 msgstr "עיר"
 
 #. item
-#: build/trans_presets.java:2636
+#: build/trans_presets.java:2637
 msgid "Edit City"
 msgstr "ערוך עיר"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2641
+#: build/trans_presets.java:2642
 msgid "Town"
 msgstr "עיירה"
@@ -16844,10 +17207,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 "ערוך עיירה"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2649
 msgid "Suburb"
 msgstr "פרבר"
@@ -16855,25 +17218,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 "ערוך פרבר"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2656
 msgid "Village"
 msgstr "כפר"
 
 #. item
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2657
 msgid "Edit Village"
 msgstr "ערוך כפר"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2662
 msgid "Hamlet"
 msgstr "כפר קטן"
 
 #. item
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2663
 msgid "Edit Hamlet"
 msgstr "ערוך כפר קטן"
@@ -16881,5 +17244,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2669
 msgid "Locality"
 msgstr "מקומיות"
@@ -16887,10 +17250,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 "ערוך מקומיות"
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2676
 msgid "Island"
 msgstr "אי"
@@ -16898,5 +17261,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 "ערוך אי"
@@ -16904,5 +17267,5 @@
 #. item "Places/Island" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2683
+#: build/trans_presets.java:2684
 msgid "Cave Entrance"
 msgstr "פתח מערה"
@@ -16910,10 +17273,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 "ערוך פתח מערה"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2690
 msgid "Peak"
 msgstr "פסגה"
@@ -16921,10 +17284,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 "ערוך פסגה"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2697
 msgid "Glacier"
 msgstr "קרחון"
@@ -16932,10 +17295,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 "ערוך קרחון"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2703
+#: build/trans_presets.java:2704
 msgid "Volcano"
 msgstr "הר געש"
@@ -16943,70 +17306,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 "ערוך הר געש"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2711
+#: build/trans_presets.java:2712
 msgid "Boundaries"
 msgstr "גבולות"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2713
 msgid "National"
 msgstr "לאומי"
 
 #. item
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2714
 msgid "Edit National Boundary"
 msgstr "ערוך גבול לאומי"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2718
+#: build/trans_presets.java:2719
 msgid "Administrative"
 msgstr "מנהלי"
 
 #. item
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2720
 msgid "Edit Administrative Boundary"
 msgstr "ערוך גבול מנהלי"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2724
+#: build/trans_presets.java:2725
 msgid "Civil"
 msgstr "אזרחי"
 
 #. item
-#: build/trans_presets.java:2725
+#: build/trans_presets.java:2726
 msgid "Edit Civil Boundary"
 msgstr "ערוך תחום אזרחי"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2730
+#: build/trans_presets.java:2731
 msgid "Political"
 msgstr "פוליטי"
 
 #. item
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:2732
 msgid "Edit Political Boundary"
 msgstr "ערוך תחום פוליטי"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2736
+#: build/trans_presets.java:2737
 msgid "National park"
 msgstr "גן לאומי"
 
 #. item
-#: build/trans_presets.java:2737
+#: build/trans_presets.java:2738
 msgid "Edit National Park Boundary"
 msgstr "ערוך תחום גן לאומי"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2744
 msgid "Land use"
 msgstr ""
 
 #. group "Land use"
-#: build/trans_presets.java:2744
+#: build/trans_presets.java:2745
 msgid "Tree"
 msgstr "עץ"
@@ -17015,15 +17378,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 "ערוך עץ"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2753
 msgid "Botanical Name"
 msgstr "שם בוטני"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2755
 msgid "Wood"
 msgstr "חורש"
@@ -17032,5 +17395,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 "ערוך חורש"
@@ -17038,17 +17401,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 "מחטני"
 
-#: build/trans_presets.java:2760 build/trans_presets.java:2769
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
 msgid "deciduous"
 msgstr "נשיר"
 
-#: build/trans_presets.java:2760 build/trans_presets.java:2769
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
 msgid "mixed"
 msgstr "מעורב"
 
-#: build/trans_presets.java:2762
+#: build/trans_presets.java:2763
 msgid "Forest"
 msgstr "יער"
@@ -17057,14 +17420,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 ""
 
-#: build/trans_presets.java:2771
+#: build/trans_presets.java:2772
 msgid "Nature Reserve"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2773
 msgid "Edit Nature Reserve"
 msgstr ""
@@ -17072,25 +17435,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2777
+#: build/trans_presets.java:2778
 msgid "Scree"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:2779
 msgid "Edit Scree"
 msgstr ""
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2783
 msgid "Scrub"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2783
+#: build/trans_presets.java:2784
 msgid "Edit Scrub"
 msgstr ""
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2788
 msgid "Fell"
 msgstr ""
@@ -17098,10 +17461,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 ""
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2794
 msgid "Heath"
 msgstr "שדה-בור"
@@ -17109,5 +17472,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 "ערוך שדה-בור"
@@ -17115,5 +17478,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2801
 msgid "Farmyard"
 msgstr "חצר משק"
@@ -17122,45 +17485,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 ""
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2808
+#: build/trans_presets.java:2809
 msgid "Farmland"
 msgstr "אדמה חקלאית"
 
 #. item
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2810
 msgid "Edit Farmland Landuse"
 msgstr ""
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2814
+#: build/trans_presets.java:2815
 msgid "Meadow"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2816
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2820
+#: build/trans_presets.java:2821
 msgid "Vineyard"
 msgstr "כרם"
 
 #. item
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2822
 msgid "Edit Vineyard Landuse"
 msgstr ""
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2826
+#: build/trans_presets.java:2827
 msgid "Allotments"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:2828
 msgid "Edit Allotments Landuse"
 msgstr ""
@@ -17168,25 +17531,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2833
+#: build/trans_presets.java:2834
 msgid "Garden"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2835
 msgid "Edit Garden"
 msgstr ""
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2838
+#: build/trans_presets.java:2839
 msgid "Grass"
 msgstr "דשא"
 
 #. item
-#: build/trans_presets.java:2839
+#: build/trans_presets.java:2840
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2845
 msgid "Village Green"
 msgstr ""
@@ -17194,10 +17557,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 ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:2852
 msgid "Common"
 msgstr ""
@@ -17205,20 +17568,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 ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2858
 msgid "Park"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:2859
 msgid "Edit Park"
 msgstr ""
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2863
 msgid "Recreation Ground"
 msgstr ""
@@ -17226,5 +17589,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 ""
@@ -17232,15 +17595,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2871
 msgid "Residential area"
 msgstr "אזור מגורים"
 
 #. item
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2872
 msgid "Edit Residential Landuse"
 msgstr ""
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2877
 msgid "Graveyard"
 msgstr "בית-קברות"
@@ -17248,9 +17611,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 "ערוך בית-קברות"
 
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:2885
 msgid "Cemetery"
 msgstr "בית עלמין"
@@ -17258,39 +17621,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 ""
 
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2894
 msgid "Retail"
 msgstr "קמעוני"
 
 #. item
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2895
 msgid "Edit Retail Landuse"
 msgstr ""
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2900
 msgid "Commercial"
 msgstr "מסחרי"
 
 #. item
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2901
 msgid "Edit Commercial Landuse"
 msgstr ""
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2906
 msgid "Industrial"
 msgstr "תעשייתי"
 
 #. item
-#: build/trans_presets.java:2906
+#: build/trans_presets.java:2907
 msgid "Edit Industrial Landuse"
 msgstr ""
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2912
 msgid "Railway land"
 msgstr ""
@@ -17298,15 +17661,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 ""
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:2919
 msgid "Military"
 msgstr "צבאי"
 
 #. item
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2920
 msgid "Edit Military Landuse"
 msgstr ""
@@ -17314,55 +17677,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2925
+#: build/trans_presets.java:2926
 msgid "Construction area"
 msgstr "אתר בניה"
 
 #. item
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2927
 msgid "Edit Construction Landuse"
 msgstr ""
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2932
 msgid "Brownfield"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:2933
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2937
+#: build/trans_presets.java:2938
 msgid "Greenfield"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:2939
 msgid "Edit Greenfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:2944
 msgid "Landfill"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:2945
 msgid "Edit Landfill Landuse"
 msgstr ""
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2950
 msgid "Quarry"
 msgstr "מחצבה"
 
 #. item
-#: build/trans_presets.java:2950
+#: build/trans_presets.java:2951
 msgid "Edit Quarry Landuse"
 msgstr ""
 
 #. group "Relations"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2960
 msgid "Multipolygon"
 msgstr ""
@@ -17372,5 +17735,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 ""
@@ -17379,10 +17742,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:2970
 msgid "outer segment"
 msgstr ""
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:2970
+#: build/trans_presets.java:2971
 msgid "inner segment"
 msgstr ""
@@ -17390,5 +17753,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:2974
 msgid "Turn restriction"
 msgstr ""
@@ -17397,5 +17760,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 ""
@@ -17403,34 +17766,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 ""
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_straight_on"
 msgstr ""
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_u_turn"
 msgstr ""
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "only_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "only_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "only_straight_on"
 msgstr ""
@@ -17439,15 +17802,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2983
+#: build/trans_presets.java:2984
 msgid "from way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2985
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2986
 msgid "to way"
 msgstr ""
@@ -17455,5 +17818,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:2988
+#: build/trans_presets.java:2989
 msgid "Route"
 msgstr ""
@@ -17462,5 +17825,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 ""
@@ -17468,5 +17831,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 ""
@@ -17538,5 +17901,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
@@ -17545,17 +17908,17 @@
 msgstr "אופניים"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "bus"
 msgstr "אוטובוס"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "ski"
 msgstr ""
@@ -17608,5 +17971,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
@@ -17615,13 +17978,13 @@
 msgstr "רגל"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "hiking"
 msgstr ""
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "detour"
 msgstr ""
@@ -17635,10 +17998,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 "רכבת תחתית"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:2997
 msgid "Symbol description"
 msgstr ""
@@ -17646,26 +18009,26 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:2999
+#: build/trans_presets.java:3000
 msgid "Network"
 msgstr ""
 
 #. item "Relations/Route" combo "State"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3003
 msgid "Color (hex)"
 msgstr ""
@@ -17674,30 +18037,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:3006
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3007
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3008
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3009
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3010
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3011
 msgid "backward halt point"
 msgstr ""
@@ -21812,9 +22175,27 @@
 msgstr ""
 
+#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
+#~ msgstr "ניתן להשתמש בעכבר או ב- Ctrl+מקשי חיצים/./ למיקוד והזזה."
+
 #~ msgid "Uploading data"
 #~ msgstr "מעלה נתונים"
 
+#~ msgid "Email"
+#~ msgstr "דוא\"ל"
+
+#~ msgid "Login name (email) to the OSM account."
+#~ msgstr "שם כניסה (אי-מייל) לחשבון OSM."
+
+#~ msgid "OSM username (email)"
+#~ msgstr "שם משתמש OSM (אי-מייל)"
+
 #~ msgid "Unknown host"
 #~ msgstr "מארח לא ידוע"
+
+#~ msgid ""
+#~ "Server returned internal error. Try a reduced area or retry after waiting "
+#~ "some time."
+#~ msgstr ""
+#~ "השרת דיווח על שגיאה פנימית. נסה להקטין את השטח או נסה מחדש מאוחר יותר."
 
 #~ msgid "Commit comment"
@@ -21849,4 +22230,13 @@
 #~ msgid "Really mark this issue as ''done''?"
 #~ msgstr "באמת סמן פריט זה כ-\"הושלם\"?"
+
+#~ 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 URL.<br><b>Do not use a valuable Password.</b></html>"
+#~ msgstr ""
+#~ "<html>הזערה: הסיסמא נשמרת בצורה לא מוצפנת בקובץ המאפיינים.<br>הסיסמא "
+#~ "נשלחת בצורה לא מוצפנת לשרת, מקודדת בכתובת.<br><b>אל תשתמש בסיסמא בעלת ערך."
+#~ "</b></html>"
 
 #~ msgid ""
@@ -21865,4 +22255,12 @@
 #~ "{0}"
 
+#~ msgid "Open the OpenStreetBugs window and activate the automatic download"
+#~ msgstr "פתח את חלון OpenStreetBugs והפעל את ההורדה האוטומטית"
+
 #~ msgid "sports"
 #~ msgstr "ספורט"
+
+#~ msgid ""
+#~ "This action will require {0} individual download requests. Do you wish to "
+#~ "continue?"
+#~ msgstr "פעולה זו תצריך {0} בקשות הורדה נפרדות. האם אתה רוצה להמשיך?"
Index: applications/editors/josm/i18n/po/is.po
===================================================================
--- applications/editors/josm/i18n/po/is.po	(revision 16008)
+++ applications/editors/josm/i18n/po/is.po	(revision 16009)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-14 16:51+0200\n"
-"PO-Revision-Date: 2009-06-09 18:07+0000\n"
+"POT-Creation-Date: 2009-06-19 21:52+0200\n"
+"PO-Revision-Date: 2009-06-14 17:34+0000\n"
 "Last-Translator: Ævar Arnfjörð Bjarmason <avarab@gmail.com>\n"
 "Language-Team: Icelandic <is@li.org>\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:45+0000\n"
+"X-Launchpad-Export-Date: 2009-06-19 19:35+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 "Hjálp"
 
 #: ../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 ""
 
@@ -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"
@@ -535,5 +537,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}"
@@ -603,6 +605,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:92
-msgid "Email"
-msgstr "Netfang"
+msgid "E-Mail"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:96
@@ -638,12 +640,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
@@ -670,5 +674,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
@@ -701,5 +705,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:207
 #, java-format
-msgid "Helppage missing. Create it in <A HREF=\"{0}\">english</A>."
+msgid "Help page missing. Create it in <A HREF=\"{0}\">english</A>."
 msgstr ""
 
@@ -707,5 +711,5 @@
 #, 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 ""
@@ -1127,13 +1131,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:99
 msgid "Status Report"
 msgstr "Stöðuskýrsla"
 
-#: ../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 "Afrita á klemmuborðið og loka"
 
-#: ../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
@@ -1318,103 +1322,273 @@
 msgstr ""
 
-#: ../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 "Uppfæra gögn"
 
-#: ../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 ""
 "Nær aftur í gögnin sem sjást í núverandi lagi frá þjóninum og uppfærir þau."
 
-#: ../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?"
 msgstr ""
 
-#: ../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 ""
-
-#: ../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 "Upphala til OSM..."
 
-#: ../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 "Upphala öllum breytingum á OSM þjóninn."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:96
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:94
 msgid "Objects to add:"
 msgstr "Hlutum sem verður bætt við:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102
 msgid "Objects to modify:"
 msgstr "Hlutum sem verður breytt:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:110
 msgid "Objects to delete:"
 msgstr "Hlutum sem verður eytt:"
 
-#: ../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 "Bættu við stuttri umsögn um þær breytingar sem þú ert að hlaða upp:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:126
 msgid "Upload these changes?"
 msgstr "Hlaða upp breytingum?"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:130
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
 msgid "Upload Changes"
 msgstr "Hlaða upp breytingum"
 
-#: ../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 ""
 
-#: ../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 "Það eru óleystir breytingarárekstrar. Þú verður að leysa þá fyrst."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:182
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:180
 msgid "No changes to upload."
 msgstr "Engar  breytingar til að hlaða upp."
 
-#: ../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 ""
@@ -1519,36 +1693,50 @@
 msgstr "GPS gögn"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:44
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:46
 msgid "Downloading data"
 msgstr "Sæki gögn"
 
-#: ../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 ""
 
-#: ../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 "Gagnalag {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 "OpenStreetMap gögn"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:37
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:45
 msgid "Data Layer"
 msgstr "Gagnalag"
 
-#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:88
-msgid "The following errors occured during mass download:"
-msgstr ""
-
-#: ../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 ""
+
+#: ../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 ""
 
@@ -1600,34 +1788,34 @@
 msgstr "Get ekki bætt við hnút handan endamarka veraldar."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:495
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:493
 msgid "Add node"
 msgstr "Bæta við hnút"
 
-#: ../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 "Bæta hnút við veg"
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:500
+msgid "Connect existing way to node"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:502
-msgid "Connect existing way to node"
+msgid "Add a new node to an existing way"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:504
-msgid "Add a new node to an existing way"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:506
 msgid "Add node into way and connect"
 msgstr ""
 
-#: ../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 ""
 
+#: ../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 ""
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:888
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:910
-msgid "Select node under cursor."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890
 #, java-format
 msgid "Insert new node into way."
@@ -1636,14 +1824,14 @@
 msgstr[1] ""
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:897
+msgid "Start new way from last node."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:899
-msgid "Start new way from last node."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:901
 msgid "Continue way from last node."
 msgstr ""
 
-#: ../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 ""
@@ -1959,25 +2147,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 ""
 
-#: ../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 "Sæki..."
 
-#: ../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 "Gat ekki lesið frá veffang: \"{0}\""
 
-#: ../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 ""
 
@@ -2039,13 +2233,83 @@
 msgstr "Leysa {0} árekstra í {1} hlutum"
 
-#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97
+#, java-format
+msgid "Delete {0} {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153
+msgid "Conflicting relation"
+msgstr "Vensl rekast á"
+
+#: ../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 ""
+"Valið \"{0}\" er notað af venslunum \"{1} með hlutverkið {2}.\n"
+"Eyða úr venslunum?"
+
+#: ../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 "Fjarlægja úr venslum"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
+#, java-format
+msgid ""
+"Selection \"{0}\" is used by relation \"{1}\".\n"
+"Delete from relation?"
+msgstr "Valið „{0}“ er notað af venslunum „{1}“."
+
+#: ../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 ""
+"Þú ert að fara eyða hnútum utan þess svæðis sem þú hefur niðurhalað."
+"<br>Þetta getur valdið vandamálum því aðrir hlutir (sem þú sérð ekki) gætu "
+"verið að nota þá.<br>Ertu viss um að þú viljir eyða þeim?"
+
+#: ../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 ""
+
 #: ../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"
@@ -2054,10 +2318,217 @@
 msgstr[1] "hnútar"
 
-#: ../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 ""
+
+#: ../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 "Vensl"
+
+#: ../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 "Ekki vista breytingar"
+
+#: ../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 ""
+
+#: ../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 "S"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+msgid "N"
+msgstr "N"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+msgid "W"
+msgstr "V"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+msgid "E"
+msgstr "A"
+
+#: ../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 "Villa: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
+#, java-format
+msgid "Warning: {0}"
+msgstr "Viðvörun: {0}"
+
+#: ../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"
@@ -2066,8 +2537,10 @@
 msgstr[1] "vegir"
 
-#: ../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
@@ -2078,261 +2551,27 @@
 msgstr[1] "vensl"
 
-#: ../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 ""
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97
-#, java-format
-msgid "Delete {0} {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153
-msgid "Conflicting relation"
-msgstr "Vensl rekast á"
-
-#: ../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 ""
-"Valið \"{0}\" er notað af venslunum \"{1} með hlutverkið {2}.\n"
-"Eyða úr venslunum?"
-
-#: ../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 "Fjarlægja úr venslum"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
-#, java-format
-msgid ""
-"Selection \"{0}\" is used by relation \"{1}\".\n"
-"Delete from relation?"
-msgstr "Valið „{0}“ er notað af venslunum „{1}“."
-
-#: ../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 ""
-"Þú ert að fara eyða hnútum utan þess svæðis sem þú hefur niðurhalað."
-"<br>Þetta getur valdið vandamálum því aðrir hlutir (sem þú sérð ekki) gætu "
-"verið að nota þá.<br>Ertu viss um að þú viljir eyða þeim?"
-
-#: ../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 ""
-
-#: ../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 ""
-
-#: ../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 "Vensl"
-
-#: ../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 "Ekki vista breytingar"
-
-#: ../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 ""
-
-#: ../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 "S"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
-msgid "N"
-msgstr "N"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
-msgid "W"
-msgstr "V"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
-msgid "E"
-msgstr "A"
-
-#: ../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 "Villa: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
-#, java-format
-msgid "Warning: {0}"
-msgstr "Viðvörun: {0}"
-
-#: ../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"
@@ -2346,5 +2585,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:122
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "railway"
 msgstr ""
@@ -2366,4 +2605,62 @@
 msgstr[1] "{0} hnútar"
 
+#: ../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."
@@ -2511,5 +2808,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 "bakgrunnur"
@@ -2582,8 +2879,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
@@ -2595,7 +2892,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
@@ -2696,10 +2993,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 "Notandanafn"
 
 #: ../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 "Lykilorð"
@@ -2793,22 +3090,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:146
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148
 msgid "File"
 msgstr "Skrá"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150
 msgid "View"
 msgstr "Sýn"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:149
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151
 msgid "Tools"
 msgstr "Tól"
 
-#: ../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 "Forstillingar"
 
-#: ../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
@@ -2821,21 +3118,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 "Möskvahamur"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:218
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221
 msgid "Toggle Wireframe view"
 msgstr "Fara í möskvaham"
 
-#: ../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 "Hljóð"
@@ -2907,6 +3204,6 @@
 msgstr "(enginn hlutur)"
 
-#: ../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 ""
@@ -2916,9 +3213,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:104
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:105
 msgid "Error while parsing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:107
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:108
 msgid "File not found"
 msgstr "Skrá fannst ekki"
@@ -2990,5 +3287,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 "Stök"
@@ -3184,5 +3481,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
@@ -3264,5 +3561,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 ""
@@ -3301,5 +3598,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 ""
 
@@ -3353,5 +3650,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 "Hlutverk"
@@ -3455,5 +3752,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
@@ -3762,5 +4059,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 "Vensl"
@@ -3867,66 +4164,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 "Vista breytingar"
 
-#: ../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 ""
 
-#: ../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 "Gengt af"
 
-#: ../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 "Eigindi (tómt gildi eyðir eigindunum)"
 
-#: ../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 "Færa valda meðlimi upp"
 
-#: ../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 "Bæta við vali"
 
-#: ../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 "Bæta völdum hlutum við venslin"
 
-#: ../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 "Fjarlægja val"
 
-#: ../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 ""
 
-#: ../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 "Færa valda meðlimi niður"
 
-#: ../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 "Fjarlægja val úr venslunum"
 
-#: ../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 "Niðurhala meðlimum"
 
-#: ../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 "Hala niður öllum nóðum og vegum í þessum venslum"
@@ -3971,5 +4268,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
@@ -3990,9 +4287,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 "já"
 
-#: ../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
@@ -4014,30 +4311,33 @@
 #: 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 "nei"
 
-#: ../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 "Stök: {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 ""
 
-#: ../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 ""
 
-#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:562
+msgid "Error when communicating with server."
 msgstr ""
 
@@ -4104,17 +4404,17 @@
 msgstr "Gagnabankar"
 
-#: ../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 "Sækja sem nýtt lag"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:174
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:173
 msgid "Download Area"
 msgstr "Niðurhalssvæði"
 
-#: ../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 "Niðurhalssvæði er of stórt. Verður sennilega hafnað af þjóni"
 
-#: ../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 "Stærð niðurhalssvæðis er ok, stærð sennilega ásættanleg fyrir þjón"
@@ -4142,5 +4442,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 "Staðir"
@@ -4187,21 +4487,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 "gerð"
@@ -4241,14 +4541,4 @@
 msgid "Tile Numbers"
 msgstr "Reitnúmer"
-
-#: ../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 "Þú getur notað músina eða Ctrl+örvarlykla/./ til að þysja og hliðra."
-
-#. 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 "Kort"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:98
@@ -4327,5 +4617,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)"
@@ -4441,14 +4731,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 "Flytja inn myndir"
 
-#: ../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, "
@@ -4457,5 +4747,5 @@
 msgstr[1] "{0} ferlar, "
 
-#: ../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, "
@@ -4464,5 +4754,5 @@
 msgstr[1] "{0} leiðir, "
 
-#: ../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"
@@ -4471,28 +4761,28 @@
 msgstr[1] "{0} punktar"
 
-#: ../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 "Tímaspan: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354
 msgid "Length: "
 msgstr "Lengd: "
 
-#: ../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 "Breyta í gagnalag"
 
-#: ../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 ""
@@ -4501,11 +4791,11 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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
@@ -4515,29 +4805,29 @@
 msgstr ""
 
-#: ../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 "{0} km²"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:822
 #, java-format
 msgid ""
@@ -4546,9 +4836,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 "
@@ -4556,5 +4846,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 "
@@ -4562,33 +4852,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 "Tölfræði um {0}:"
 
-#: ../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 ""
 
-#: ../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"
@@ -4596,21 +4895,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"
@@ -4752,5 +5051,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
@@ -4759,5 +5058,5 @@
 msgstr ""
 
-#: ../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
@@ -4765,5 +5064,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
@@ -4773,5 +5072,5 @@
 msgstr ""
 
-#: ../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 ""
@@ -5648,106 +5947,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 "Heiti"
@@ -6214,5 +6513,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 ""
 
@@ -6227,6 +6526,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
-msgid "OSM username (email)"
-msgstr "OSM notandanafn (getur verið tölvupóstfang)"
+msgid "OSM username (e-mail)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
@@ -6237,5 +6536,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 ""
@@ -6529,6 +6828,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 "Hef samband við OpenStreetMap miðlara..."
@@ -6539,7 +6839,7 @@
 msgstr "Hala niður punktum {0} til {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 "Hala niður OSM gögnum..."
@@ -6604,15 +6904,14 @@
 msgstr ""
 
-#: ../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 ""
@@ -6621,31 +6920,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 "Opna breytingasett..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:351
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298
 msgid "Closing changeset..."
 msgstr "Loka breytingasetti..."
 
-#: ../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 "Undirbý..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:381
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:326
 msgid "Uploading..."
 msgstr "Hleð upp gögnum..."
@@ -6660,25 +6965,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 "Rangt lykilorð eða notandanafn"
 
-#: ../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 "Viðvörun: Lykilorðið er sent ódulkóðað"
 
-#: ../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 "Vista notandanafn og lykilorð (ódulkóðað)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:89
 msgid "Enter Password"
 msgstr "Sláðu inn lykilorð"
 
-#: ../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..."
@@ -6689,4 +6994,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."
@@ -6779,9 +7127,23 @@
 msgstr "Illa-formað kenni á hnút"
 
-#: ../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 "Hef samband við þjóninn..."
 
-#: ../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."
@@ -6789,17 +7151,9 @@
 "Gat ekki tengst OSM þjóninum. Vinsamlegast athugaðu nettenginguna þína."
 
-#: ../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 ""
-"Það kom upp innri villa á þjóninum. Prófaðu að hala niður minna svæði eða "
-"reyna síðar."
-
-#: ../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 ""
 
@@ -6815,5 +7169,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 ""
@@ -6991,9 +7345,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 ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:128
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:119
 #, java-format
 msgid ""
@@ -7003,6 +7357,6 @@
 msgstr ""
 
+#: ../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
@@ -7025,35 +7379,35 @@
 msgstr ""
 
-#: ../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}: Útgáfa {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 ""
 
-#: ../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 "Þetta er eftir enda upptöku"
 
-#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:329
+#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:340
 msgid "Error playing sound"
 msgstr "Villa við að spila hljóð"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
 msgid "Do nothing"
 msgstr "Gera ekkert"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
 msgid "Report Bug"
 msgstr "Senda villutilkynningu"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:52
 msgid ""
 "An unexpected exception occurred.\n"
@@ -7067,14 +7421,14 @@
 "útgáfuna af JOSM, vinsamlegast sendu þá inn villumeldinguna."
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55
 msgid "Unexpected Exception"
 msgstr "Óvænt villa"
 
-#: ../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 "Vinsamlegast sendu meldinguna á {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 ""
@@ -7082,5 +7436,5 @@
 "nákvæmt og hægt er)"
 
-#: ../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 "
@@ -7090,9 +7444,9 @@
 "tilkynnir um villu."
 
-#: ../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 "Vertu viss um að láta eftirfarandi upplýsingar fylgja:"
 
-#: ../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 "Textinn hefur verið þegar verið afritaður"
@@ -7178,5 +7532,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 "Lýsing"
@@ -7543,5 +7897,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 ""
@@ -7575,5 +7929,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"
@@ -7596,5 +7949,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
@@ -7685,6 +8038,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/"
@@ -7760,6 +8113,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
@@ -7767,11 +8120,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 ""
@@ -7788,13 +8141,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 ""
@@ -7815,5 +8168,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 ""
 
@@ -7906,5 +8259,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
@@ -7912,59 +8265,28 @@
 msgstr "Tómt lag"
 
+#: ../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 "Vista WMS lag í skrá"
-
-#: ../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 "Hlaða WMS lag úr skrá"
-
-#: ../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 ""
@@ -7973,14 +8295,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 ""
@@ -8075,11 +8397,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 ""
@@ -8089,5 +8411,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 ""
@@ -8374,4 +8696,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 ""
 
@@ -8683,42 +9009,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 "Mælingar"
 
-#: ../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 "Opna mæligluggann."
 
-#: ../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 "Endurstilla"
 
-#: ../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 "Endurstillir mæld gildi og eyðir mælistikunni."
 
-#: ../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 "Lengd mælistiku"
 
-#: ../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 "Lengd vals"
 
-#: ../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 "Flatarmál vals"
 
-#: ../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 "Horn"
 
-#: ../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 "Hornið milli tveggja valinna nóða"
 
-#: ../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 "Lag ætlað til mælinga"
@@ -8775,6 +9101,6 @@
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
-msgid "Open the OpenStreetBugs window and activate the automatic download"
-msgstr "Opna OpenStreetBugs gluggann og virkja sjálfvirkt niðurhal paddna."
+msgid "Opens the OpenStreetBugs window and activates the automatic download"
+msgstr ""
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:123
@@ -8849,5 +9175,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 "
@@ -8855,9 +9181,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 ""
@@ -9284,5 +9610,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 "Nafn götu"
@@ -9372,5 +9698,5 @@
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:195
-msgid "No intersections found. Nothing was changed."
+msgid "No intersection found. Nothing was changed."
 msgstr ""
 
@@ -10233,19 +10559,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 ""
@@ -10304,5 +10629,5 @@
 msgstr "Leiðrétta stöðu WMS lagsins sem nú er valið"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113
 #, java-format
 msgid ""
@@ -10344,4 +10669,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 "Vista WMS lag í skrá"
+
+#: ../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 "Hlaða WMS lag úr skrá"
+
+#: ../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 ""
 
@@ -10433,4 +10783,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 ""
@@ -10445,5 +10800,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 ""
 
@@ -10727,5 +11082,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 "Tilvísun"
@@ -11227,5 +11582,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 "Breidd (í metrum)"
@@ -11694,7 +12049,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 "Gerð"
@@ -12310,10 +12665,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 "Rekstraraðili"
@@ -12525,7 +12880,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 "Hæð (y/s)"
@@ -13457,5 +13812,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 ""
@@ -13591,5 +13946,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 ""
@@ -13597,5 +13952,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 ""
@@ -13647,11 +14002,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 "Skýli"
+
+#. 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 ""
@@ -13659,5 +14024,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1512
+#: build/trans_presets.java:1513
 msgid "Taxi"
 msgstr "Leigubílastöð"
@@ -13665,5 +14030,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 "Breyti leigubílastöð"
@@ -13671,5 +14036,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1519
+#: build/trans_presets.java:1520
 msgid "Airport"
 msgstr "Flugvöllur"
@@ -13677,15 +14042,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 "Breyti flugvelli"
 
 #. 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 ""
@@ -13694,5 +14059,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1532
+#: build/trans_presets.java:1533
 msgid "Accomodation"
 msgstr "Gisting"
@@ -13704,5 +14069,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 "Hótel"
@@ -13711,15 +14076,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 "Breyti hóteli"
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1539
+#: build/trans_presets.java:1540
 msgid "Stars"
 msgstr "Stjörnur"
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1541
+#: build/trans_presets.java:1542
 msgid "Motel"
 msgstr "Vegahótel"
@@ -13727,20 +14092,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 "Breyti vegahóteli"
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1547
+#: build/trans_presets.java:1548
 msgid "Guest House"
 msgstr "Gistiheimili"
 
 #. item
-#: build/trans_presets.java:1548
+#: build/trans_presets.java:1549
 msgid "Edit Guest House"
 msgstr "Breyti gistiheimili"
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1552
+#: build/trans_presets.java:1553
 msgid "Chalet"
 msgstr "Fjallakofi (e. Chalet)"
@@ -13748,10 +14113,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 "Breyti fjallakofa í svissneskum stíl (e. Chalet)"
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1558
+#: build/trans_presets.java:1559
 msgid "Hostel"
 msgstr "Farfuglaheimili"
@@ -13759,30 +14124,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 "Breyti farfuglaheimili"
 
 #. 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 "Húsbílastæði"
 
 #. item
-#: build/trans_presets.java:1571
+#: build/trans_presets.java:1572
 msgid "Edit Caravan Site"
 msgstr "Breyti húsbílastæði"
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1575
+#: build/trans_presets.java:1576
 msgid "Camping Site"
 msgstr "Tjaldstæði"
@@ -13790,10 +14155,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 "Breyti tjaldstæði"
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1582
+#: build/trans_presets.java:1583
 msgid "Food+Drinks"
 msgstr "Matur & Drykkur"
@@ -13804,5 +14169,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 "Veitingastaður"
@@ -13810,5 +14175,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 "Breyti veitingastað"
@@ -13816,5 +14181,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 "Matargerð"
@@ -13822,61 +14187,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 "ítölsk"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "chinese"
 msgstr "kínversk"
 
-#: 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 "grísk"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "german"
 msgstr "þýsk"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "indian"
 msgstr "indversk"
 
-#: 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 "tyrknesk"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "asian"
 msgstr "asísk"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "thai"
 msgstr "tælensk"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "mexican"
 msgstr "mexíkósk"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "japanese"
 msgstr "japönsk"
 
-#: build/trans_presets.java:1590
+#: build/trans_presets.java:1591
 msgid "Fast Food"
 msgstr "Skyndibiti"
@@ -13884,9 +14249,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 "Breyti skyndibitastað"
 
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1598
 msgid "Cafe"
 msgstr "Kaffihús"
@@ -13894,10 +14259,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 "Breyti kaffihúsi"
 
 #. item "Food+Drinks/Cafe" text "Name"
-#: build/trans_presets.java:1603
+#: build/trans_presets.java:1604
 msgid "Pub"
 msgstr "Bar"
@@ -13905,20 +14270,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 "Breyti bar"
 
 #. 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 ""
@@ -13926,10 +14291,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 "Næturklúbbur"
@@ -13937,20 +14302,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 "Breyti næturklúbb"
 
 #. item "Food+Drinks/Nightclub" text "Name"
-#: build/trans_presets.java:1627
+#: build/trans_presets.java:1628
 msgid "Tourism"
 msgstr "Ferðamennska"
 
 #. 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 ""
@@ -13959,11 +14324,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 "Opnunartími"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1634
+#: build/trans_presets.java:1635
 msgid "Museum"
 msgstr "Safn"
@@ -13971,10 +14336,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 "Breyti safni"
 
 #. item "Tourism/Museum" text "Name"
-#: build/trans_presets.java:1640
+#: build/trans_presets.java:1641
 msgid "Zoo"
 msgstr "Dýragarður"
@@ -13983,10 +14348,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 "Breyti dýragarð"
 
 #. item "Tourism/Zoo" text "Name"
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1648
 msgid "Viewpoint"
 msgstr "Útsýnisstaður"
@@ -13994,25 +14359,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 "Breyti útsýnisstað"
 
 #. 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 "Skemmtigarður"
 
 #. item
-#: build/trans_presets.java:1655
+#: build/trans_presets.java:1656
 msgid "Edit Theme Park"
 msgstr "Breyti skemmtigarð"
 
 #. item "Tourism/Theme Park" text "Name"
-#: build/trans_presets.java:1659
+#: build/trans_presets.java:1660
 msgid "Artwork"
 msgstr "Listaverk"
@@ -14020,5 +14385,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 "Breyti listaverki"
@@ -14026,5 +14391,5 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1667
 msgid "Information Office"
 msgstr "Upplýsingamiðstöð"
@@ -14032,83 +14397,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 "Breyti upplýsingamiðstöð"
 
+#. item "Tourism/Information Office" text "Opening Hours"
+#: build/trans_presets.java:1675
+msgid "Map"
+msgstr "Kort"
+
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1679
 msgid "Map Type"
 msgstr "Gerð korts"
 
 #. item "Tourism/Map" combo "Map Type"
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1679
 msgid "map"
 msgstr "kort"
 
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1679
 msgid "citymap"
 msgstr "borgarkort"
 
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1679
 msgid "hikingmap"
 msgstr "göngukort"
 
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1679
 msgid "bicyclemap"
 msgstr "hjólakort"
 
 #. 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 "Nánari lýsing"
 
 #. item "Tourism/Map" text "Closer Description"
-#: build/trans_presets.java:1681
+#: build/trans_presets.java:1682
 msgid "Information Board"
 msgstr "Fræðsluskilti"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1686
 msgid "Board Type"
 msgstr "Viðfangsefni skiltisins"
 
 #. 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 "sagnfræði"
 
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1686
 msgid "nature"
 msgstr "náttúran"
 
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1686
 msgid "wildlife"
 msgstr "dýralíf"
 
 #. 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 "Skýli"
-
-#. item
-#: build/trans_presets.java:1703
+#. item
+#: build/trans_presets.java:1704
 msgid "Edit Shelter"
 msgstr "Breyti skýli"
@@ -14116,25 +14478,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 "Eldstæði"
 
 #. 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 "Sögustaðir"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1716
+#: build/trans_presets.java:1717
 msgid "Castle"
 msgstr "Kastali"
@@ -14143,20 +14505,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 "Breyti kastala"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1724
 msgid "Ruins"
 msgstr "Rústir"
 
 #. item
-#: build/trans_presets.java:1724
+#: build/trans_presets.java:1725
 msgid "Edit Ruins"
 msgstr "Breyti rústum"
 
 #. item "Historic Places/Ruins" text "Name"
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1729
 msgid "Archaeological Site"
 msgstr "Fornleifasvæði"
@@ -14165,10 +14527,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 "Breyti fornleifasvæði"
 
 #. item "Historic Places/Archaeological Site" text "Name"
-#: build/trans_presets.java:1735
+#: build/trans_presets.java:1736
 msgid "Battlefield"
 msgstr "Vígvöllur"
@@ -14176,5 +14538,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 "Breyti vígvelli"
@@ -14182,15 +14544,15 @@
 #. item "Historic Places/Battlefield" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1743
 msgid "Monument"
 msgstr "Minnismerki"
 
 #. item
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1744
 msgid "Edit Monument"
 msgstr "Breyti minnismerki"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1748
 msgid "Memorial"
 msgstr "Minnisvarði"
@@ -14198,45 +14560,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 "Breyti minnisvarða"
 
 #. 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 "Frístundir"
 
 #. group "Leisure"
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1766
 msgid "Water Park"
 msgstr "Vatnsleikjagarður"
 
 #. item
-#: build/trans_presets.java:1766
+#: build/trans_presets.java:1767
 msgid "Edit Water Park"
 msgstr "Breyti vatnsleikjagarð"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1770
+#: build/trans_presets.java:1771
 msgid "Playground"
 msgstr "Leikvöllur"
@@ -14244,15 +14606,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 "Breyti leikvöll"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1776
+#: build/trans_presets.java:1777
 msgid "Fishing"
 msgstr "Fiskveiðar"
 
 #. item
-#: build/trans_presets.java:1777
+#: build/trans_presets.java:1778
 msgid "Edit Fishing"
 msgstr "Breyti fiskveiðum"
@@ -14260,15 +14622,15 @@
 #. item "Leisure/Fishing" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1783
+#: build/trans_presets.java:1784
 msgid "Sport Facilities"
 msgstr "Íþróttamannvirki"
 
 #. 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 ""
@@ -14282,6 +14644,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 "veldu íþrótt:"
@@ -14657,6 +15019,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
@@ -14689,227 +15051,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 "bogfimi"
 
-#: 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 "hafnabolti"
 
-#: 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 "körfubolti"
 
-#: 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 "klifur"
 
-#: 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 "hokkí"
 
-#: 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 "skautar"
 
-#: 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 "skíði"
 
-#: 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 "fótbolti"
 
-#: 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 "sund"
 
-#: 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 "borðtennis"
 
-#: 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 "Íþróttamiðstöð"
 
 #. item
-#: build/trans_presets.java:1794
+#: build/trans_presets.java:1795
 msgid "Edit Sports Centre"
 msgstr "Breyti íþróttamiðstöð"
 
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1803
 msgid "Pitch"
 msgstr "Völlur"
 
 #. item
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1804
 msgid "Edit Pitch"
 msgstr "Breyti velli"
 
-#: 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 "Íþróttir"
 
 #. 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 ""
@@ -14948,191 +15310,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 "völlur"
 
-#: 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 "Bogfimi"
 
 #. item
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:1852
 msgid "Edit Archery"
 msgstr "Breyti bogfimi"
 
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:1857
 msgid "Climbing"
 msgstr "Klifur"
 
 #. item
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:1858
 msgid "Edit Climbing"
 msgstr "Breyti klifri"
 
-#: 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 "Skautar"
 
 #. item
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:1906
 msgid "Edit Skating"
 msgstr "Breyti skautum"
 
-#: 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 "Sund"
 
 #. item
-#: build/trans_presets.java:1917
+#: build/trans_presets.java:1918
 msgid "Edit Swimming"
 msgstr "Breyti sundi"
 
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:1923
 msgid "Skiing"
 msgstr "Skíði"
@@ -15140,56 +15502,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 "Breyti skíðasvæði"
 
 #. 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 ""
 
 #. 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 ""
 
-#: 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 ""
 
-#: 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 ""
@@ -15197,178 +15559,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 "Boltaíþróttir"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1941
 msgid "Soccer"
 msgstr "Fótbolti"
 
 #. item
-#: build/trans_presets.java:1941
+#: build/trans_presets.java:1942
 msgid "Edit Soccer"
 msgstr "Breyti fótbolta"
 
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:1947
 msgid "Football"
 msgstr "Amerískur fótbolti"
 
 #. item
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:1948
 msgid "Edit Football"
 msgstr "Breyti Amerískum fótbolta"
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1953
 msgid "Australian Football"
 msgstr "Ástralskur fótbolti"
 
 #. item
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:1954
 msgid "Edit Australian Football"
 msgstr "Breyti Áströlskum fótbolta"
 
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:1959
 msgid "Baseball"
 msgstr "Hafnabolti"
 
 #. item
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:1960
 msgid "Edit Baseball"
 msgstr "Breyti hafnabolta"
 
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:1965
 msgid "Basketball"
 msgstr "Körfubolti"
 
 #. item
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:1966
 msgid "Edit Basketball"
 msgstr "Breyti körfubolta"
 
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:1971
 msgid "Golf"
 msgstr ""
 
 #. 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 ""
 
 #. item
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:1990
 msgid "Edit Cricket"
 msgstr ""
 
-#: 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 "Hokkí"
 
 #. item
-#: build/trans_presets.java:2007
+#: build/trans_presets.java:2008
 msgid "Edit Hockey"
 msgstr "Breyti hokkí"
 
-#: 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 ""
 
 #. item
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2026
 msgid "Edit Rugby"
 msgstr ""
 
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:2031
 msgid "Table Tennis"
 msgstr "Borðtennis"
 
 #. item
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2032
 msgid "Edit Table Tennis"
 msgstr "Breyti borð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 "Breyti tennis"
 
 #. <separator/>
-#: build/trans_presets.java:2044
+#: build/trans_presets.java:2045
 msgid "Buildings"
 msgstr "Byggingar"
 
 #. group "Buildings"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2046
 msgid "Building"
 msgstr "Bygging"
@@ -15376,5 +15738,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2049
 msgid "Public Building"
 msgstr "Opinber bygging"
@@ -15382,10 +15744,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 "Breyti opinberri byggingu"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2055
 msgid "Town hall"
 msgstr "Ráðhús"
@@ -15393,10 +15755,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 "Breyti ráðhúsi"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2061
 msgid "Embassy"
 msgstr "Sendiráð"
@@ -15404,10 +15766,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 "Breyti sendiráði"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2066
+#: build/trans_presets.java:2067
 msgid "Courthouse"
 msgstr "Dómshús"
@@ -15416,10 +15778,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 "Breyti dómshúsi"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2074
 msgid "Prison"
 msgstr "Fangelsi"
@@ -15428,10 +15790,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 "Breyti fangelsi"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2080
+#: build/trans_presets.java:2081
 msgid "Police"
 msgstr "Lögreglustöð"
@@ -15441,10 +15803,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 "Breyti lögreglustöð"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2089
 msgid "Fire Station"
 msgstr "Slökkvistöð"
@@ -15453,10 +15815,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 "Breyti slökkvistöð"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2096
 msgid "Post Office"
 msgstr "Pósthús"
@@ -15464,5 +15826,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 "Breyti pósthúsi"
@@ -15470,15 +15832,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2103
 msgid "Kindergarten"
 msgstr "Leikskóli"
 
 #. item
-#: build/trans_presets.java:2103
+#: build/trans_presets.java:2104
 msgid "Edit Kindergarten"
 msgstr "Breyti leikskóla"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2108
 msgid "School"
 msgstr "Skóli"
@@ -15486,10 +15848,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 "Breyti skóla"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2114
 msgid "University"
 msgstr "Háskóli"
@@ -15497,10 +15859,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 "Breyti háskóla"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2120
 msgid "College"
 msgstr "Menntaskóli"
@@ -15508,5 +15870,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 "Breyti menntaskóla"
@@ -15514,5 +15876,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2126
+#: build/trans_presets.java:2127
 msgid "Cinema"
 msgstr "Kvikmyndahús"
@@ -15521,10 +15883,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 "Breyti kvikmyndahúsi"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2133
+#: build/trans_presets.java:2134
 msgid "Library"
 msgstr "Bókasafn"
@@ -15533,10 +15895,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 "Breyti bókasafni"
 
 #. item "Buildings/Library" text "Name"
-#: build/trans_presets.java:2140
+#: build/trans_presets.java:2141
 msgid "Arts Centre"
 msgstr "Listamiðstöð"
@@ -15544,10 +15906,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 "Breyti listamiðstöð"
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2146
+#: build/trans_presets.java:2147
 msgid "Theatre"
 msgstr "Leikhús"
@@ -15556,10 +15918,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 "Breyti leikhúsi"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2154
 msgid "Place of Worship"
 msgstr "Helgistaður"
@@ -15569,5 +15931,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 "Breyti helgistað"
@@ -15576,6 +15938,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 ""
@@ -15584,66 +15946,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
-msgid "bahai"
-msgstr ""
-
-#: build/trans_presets.java:2160 build/trans_presets.java:2881
-#: build/trans_presets.java:2890
-msgid "buddhist"
-msgstr ""
-
-#: build/trans_presets.java:2160 build/trans_presets.java:2881
-#: build/trans_presets.java:2890
-msgid "christian"
-msgstr ""
-
-#: build/trans_presets.java:2160 build/trans_presets.java:2881
-#: build/trans_presets.java:2890
-msgid "hindu"
-msgstr ""
-
-#: build/trans_presets.java:2160 build/trans_presets.java:2881
-#: build/trans_presets.java:2890
-msgid "jain"
-msgstr ""
-
-#: build/trans_presets.java:2160 build/trans_presets.java:2881
-#: build/trans_presets.java:2890
-msgid "jewish"
-msgstr ""
-
-#: build/trans_presets.java:2160 build/trans_presets.java:2881
-#: build/trans_presets.java:2890
-msgid "muslim"
-msgstr ""
-
-#: build/trans_presets.java:2160 build/trans_presets.java:2881
-#: build/trans_presets.java:2890
-msgid "sikh"
-msgstr ""
-
-#: build/trans_presets.java:2160 build/trans_presets.java:2881
-#: build/trans_presets.java:2890
-msgid "spiritualist"
-msgstr ""
-
-#: build/trans_presets.java:2160 build/trans_presets.java:2881
-#: build/trans_presets.java:2890
-msgid "taoist"
-msgstr ""
-
-#: build/trans_presets.java:2160 build/trans_presets.java:2881
-#: build/trans_presets.java:2890
-msgid "unitarian"
-msgstr ""
-
-#: build/trans_presets.java:2160 build/trans_presets.java:2881
-#: build/trans_presets.java:2890
-msgid "zoroastrian"
-msgstr ""
-
 #: build/trans_presets.java:2161 build/trans_presets.java:2882
 #: build/trans_presets.java:2891
+msgid "bahai"
+msgstr ""
+
+#: build/trans_presets.java:2161 build/trans_presets.java:2882
+#: build/trans_presets.java:2891
+msgid "buddhist"
+msgstr ""
+
+#: build/trans_presets.java:2161 build/trans_presets.java:2882
+#: build/trans_presets.java:2891
+msgid "christian"
+msgstr ""
+
+#: build/trans_presets.java:2161 build/trans_presets.java:2882
+#: build/trans_presets.java:2891
+msgid "hindu"
+msgstr ""
+
+#: build/trans_presets.java:2161 build/trans_presets.java:2882
+#: build/trans_presets.java:2891
+msgid "jain"
+msgstr ""
+
+#: build/trans_presets.java:2161 build/trans_presets.java:2882
+#: build/trans_presets.java:2891
+msgid "jewish"
+msgstr ""
+
+#: build/trans_presets.java:2161 build/trans_presets.java:2882
+#: build/trans_presets.java:2891
+msgid "muslim"
+msgstr ""
+
+#: build/trans_presets.java:2161 build/trans_presets.java:2882
+#: build/trans_presets.java:2891
+msgid "sikh"
+msgstr ""
+
+#: build/trans_presets.java:2161 build/trans_presets.java:2882
+#: build/trans_presets.java:2891
+msgid "spiritualist"
+msgstr ""
+
+#: build/trans_presets.java:2161 build/trans_presets.java:2882
+#: build/trans_presets.java:2891
+msgid "taoist"
+msgstr ""
+
+#: build/trans_presets.java:2161 build/trans_presets.java:2882
+#: build/trans_presets.java:2891
+msgid "unitarian"
+msgstr ""
+
+#: build/trans_presets.java:2161 build/trans_presets.java:2882
+#: build/trans_presets.java:2891
+msgid "zoroastrian"
+msgstr ""
+
+#: build/trans_presets.java:2162 build/trans_presets.java:2883
+#: build/trans_presets.java:2892
 msgid "Denomination"
 msgstr ""
@@ -15652,81 +16014,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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 "Heimilisfang"
@@ -15735,5 +16097,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 "Breyti heimilisfangi"
@@ -15741,5 +16103,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2169
+#: build/trans_presets.java:2170
 msgid "House number"
 msgstr "Húsnúmer"
@@ -15747,20 +16109,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2172
 msgid "House name"
 msgstr "Nafn húss"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2174
 msgid "City name"
 msgstr "Nafn bæjar"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2174
+#: build/trans_presets.java:2175
 msgid "Post code"
 msgstr "Póstnúmer"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2176
 msgid "Country code"
 msgstr "Landskóði"
@@ -15768,5 +16130,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2179
 msgid "Address Interpolation"
 msgstr ""
@@ -15775,5 +16137,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 ""
@@ -15781,71 +16143,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 ""
 
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2184
 msgid "even"
 msgstr ""
 
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2184
 msgid "all"
 msgstr ""
 
-#: 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 "Mannvirki"
 
 #. group "Man Made"
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2188
 msgid "Works"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2189
 msgid "Edit Works"
 msgstr ""
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2193
 msgid "Tower"
 msgstr "Turn"
 
 #. item
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2194
 msgid "Edit Tower"
 msgstr "Breyti turni"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2198
 msgid "Water Tower"
 msgstr "Vatnsturn"
 
 #. item
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2199
 msgid "Edit Water Tower"
 msgstr "Breyti vatnsturni"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2203
 msgid "Gasometer"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2204
 msgid "Edit Gasometer"
 msgstr ""
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2207
+#: build/trans_presets.java:2208
 msgid "Lighthouse"
 msgstr "Viti"
@@ -15853,10 +16215,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 "Breyti vita"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2214
 msgid "Windmill"
 msgstr "Vindmylla"
@@ -15864,10 +16226,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 "Breyti vindmyllu"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2220
 msgid "Pipeline"
 msgstr "Leiðsla"
@@ -15875,10 +16237,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 "Breyti leiðslu"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2225
+#: build/trans_presets.java:2226
 msgid "Wastewater Plant"
 msgstr ""
@@ -15888,10 +16250,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 "Krani"
@@ -15899,10 +16261,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 "Breyti krana"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2239
+#: build/trans_presets.java:2240
 msgid "Beacon"
 msgstr ""
@@ -15910,10 +16272,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 ""
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2245
+#: build/trans_presets.java:2246
 msgid "Survey Point"
 msgstr ""
@@ -15921,10 +16283,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 ""
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2252
 msgid "Surveillance"
 msgstr "Eftirlitsmyndavél"
@@ -15932,5 +16294,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 "Breyti eftirlitsmyndavél"
@@ -15938,5 +16300,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2258
+#: build/trans_presets.java:2259
 msgid "Power Generator"
 msgstr "Rafall"
@@ -15946,39 +16308,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 "Breyti rafli"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "wind"
 msgstr ""
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "hydro"
 msgstr ""
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "fossil"
 msgstr ""
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "nuclear"
 msgstr ""
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "coal"
 msgstr ""
 
-#: 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 ""
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2268
 msgid "Power Station"
 msgstr "Orkuver"
@@ -15987,10 +16349,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 "Breyti orkuveri"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2274
+#: build/trans_presets.java:2275
 msgid "Power Sub Station"
 msgstr "Spennustöð"
@@ -15999,5 +16361,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 "Breyti spennustöð"
@@ -16005,10 +16367,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 "Tilvísunarnúmer línunnar"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2282
+#: build/trans_presets.java:2283
 msgid "Power Tower"
 msgstr "Háspennustaur"
@@ -16019,5 +16381,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 "Breyti háspennustaur"
@@ -16025,5 +16387,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 "Raflína"
@@ -16032,25 +16394,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 "Breyti raflínu"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2298
 msgid "Voltage"
 msgstr "Volt"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2299
 msgid "Amount of Wires"
 msgstr "Fjöldi víra"
 
 #. 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 "Salerni"
@@ -16058,20 +16420,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 "Tilvísun"
 
 #. 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 "Athugasemd"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2312
 msgid "Post Box"
 msgstr "Póstkassi"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2317
 msgid "Telephone"
 msgstr "Almenningssími"
@@ -16080,5 +16442,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 "Breyti almenningssíma"
@@ -16086,5 +16448,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 "Mynt"
@@ -16092,5 +16454,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 "Athugasemd"
@@ -16098,5 +16460,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 ""
@@ -16104,5 +16466,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 "Debetkort"
@@ -16110,15 +16472,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 "Kreditkort"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2328
 msgid "Telephone cards"
 msgstr "Símakort"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2330
 msgid "Recycling"
 msgstr "Endurvinnsla"
@@ -16127,5 +16489,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 "Breyti endurvinnslustöð"
@@ -16133,35 +16495,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 "Rafhlöður"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2336
 msgid "Cans"
 msgstr "Dósir"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2337
 msgid "Clothes"
 msgstr "Föt"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2338
 msgid "Glass"
 msgstr "Gler"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2339
 msgid "Paper"
 msgstr "Pappír"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2340
 msgid "Scrap Metal"
 msgstr "Brotajárn"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2342
 msgid "Bench"
 msgstr "Bekkur"
@@ -16170,20 +16532,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 ""
 
 #. item
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2347
 msgid "Edit Hunting Stand"
 msgstr ""
 
 #. item "Amenities/Hunting Stand" check "Shelter"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2350
 msgid "Hide"
 msgstr ""
 
 #. item "Amenities/Hunting Stand" check "Hide"
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2351
 msgid "Lock"
 msgstr ""
@@ -16191,22 +16553,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 "Hæð"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2351
+#: build/trans_presets.java:2352
 msgid "low"
 msgstr ""
 
-#: build/trans_presets.java:2351
+#: build/trans_presets.java:2352
 msgid "half"
 msgstr ""
 
-#: build/trans_presets.java:2351
+#: build/trans_presets.java:2352
 msgid "full"
 msgstr ""
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2354
 msgid "Fountain"
 msgstr "Gosbrunnur"
@@ -16215,10 +16577,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 "Breyti gosbrunn"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2361
 msgid "Drinking Water"
 msgstr "Drykkjarvatn"
@@ -16227,10 +16589,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 "Breyti drykkjarvatni"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2367
+#: build/trans_presets.java:2368
 msgid "Baby Hatch"
 msgstr "Barnalúga"
@@ -16238,25 +16600,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 "Breyti barnalúgu"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2375
+#: build/trans_presets.java:2376
 msgid "Shops"
 msgstr "Verslanir"
 
 #. group "Shops"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2377
 msgid "Supermarket"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2378
 msgid "Edit Supermarket"
 msgstr ""
 
 #. item "Shops/Supermarket" text "Name"
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:2382
 msgid "Convenience Store"
 msgstr ""
@@ -16264,10 +16626,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 "Sjoppa"
@@ -16275,10 +16637,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 "Breyti sjoppu"
 
 #. item "Shops/Kiosk" text "Name"
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2394
 msgid "Vending machine"
 msgstr "Sjálfsali"
@@ -16286,5 +16648,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 ""
@@ -16292,88 +16654,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 ""
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "public_transport_plans"
 msgstr ""
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "parking_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "food"
 msgstr ""
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "drinks"
 msgstr ""
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "sweets"
 msgstr ""
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "cigarettes"
 msgstr ""
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "photos"
 msgstr ""
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "animal_food"
 msgstr ""
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "news_papers"
 msgstr "dagblöð"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "toys"
 msgstr "dót"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "stamps"
 msgstr ""
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "SIM-cards"
 msgstr ""
 
-#: 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 ""
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "tampons"
 msgstr ""
 
-#: 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 "Slátrari"
@@ -16381,10 +16743,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 "Breyti slátrara"
 
 #. item "Shops/Butcher" text "Name"
-#: build/trans_presets.java:2414
+#: build/trans_presets.java:2415
 msgid "Baker"
 msgstr "Bakarí"
@@ -16392,10 +16754,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 "Breyti bakaríi"
 
 #. item "Shops/Baker" text "Name"
-#: build/trans_presets.java:2420
+#: build/trans_presets.java:2421
 msgid "Florist"
 msgstr "Blómabúð"
@@ -16403,20 +16765,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 "Breyti blómabúð"
 
 #. item "Shops/Florist" text "Name"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2427
 msgid "Organic"
 msgstr "Lífræn búð"
 
 #. item
-#: build/trans_presets.java:2427
+#: build/trans_presets.java:2428
 msgid "Edit Organic Shop"
 msgstr "Breyti lífrænni búð"
 
 #. item "Shops/Organic" text "Name"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2432
 msgid "Alcohol"
 msgstr ""
@@ -16424,60 +16786,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 "Vínbúð"
 
 #. 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 "Tölvubúð"
 
 #. item
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2444
 msgid "Edit Computer Shop"
 msgstr "Breyti tölvubúð"
 
 #. item "Shops/Computer" text "Name"
-#: build/trans_presets.java:2447
+#: build/trans_presets.java:2448
 msgid "Electronics"
 msgstr "Raftækjabúð"
 
 #. item
-#: build/trans_presets.java:2448
+#: build/trans_presets.java:2449
 msgid "Edit Electronics Shop"
 msgstr "Breyti raftækjabúð"
 
 #. item "Shops/Electronics" text "Name"
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2453
 msgid "Hifi"
 msgstr "Hljómtækjaverslun"
 
 #. item
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2454
 msgid "Edit Hifi Shop"
 msgstr "Breyti hljómtækjaverslun"
 
 #. item "Shops/Hifi" text "Name"
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2458
 msgid "Furniture"
 msgstr "Húsgagnaverslun"
 
 #. item
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2459
 msgid "Edit Furniture Shop"
 msgstr "Breyti húsgagnaverslun"
 
 #. item "Shops/Furniture" text "Name"
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2463
 msgid "Garden Centre"
 msgstr ""
@@ -16485,10 +16847,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 ""
 
 #. item "Shops/Garden Centre" text "Name"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2469
 msgid "Hardware"
 msgstr ""
@@ -16496,10 +16858,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 ""
 
 #. item "Shops/Hardware" text "Name"
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2475
 msgid "Do-it-yourself-store"
 msgstr ""
@@ -16507,60 +16869,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 "Skrifstofuvörur"
 
 #. item
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2482
 msgid "Edit Stationery Shop"
 msgstr "Breyti skrifstofuvörum"
 
 #. item "Shops/Stationery" text "Name"
-#: build/trans_presets.java:2485
+#: build/trans_presets.java:2486
 msgid "Hairdresser"
 msgstr "Hársnyrtir"
 
 #. item
-#: build/trans_presets.java:2486
+#: build/trans_presets.java:2487
 msgid "Edit Hairdresser"
 msgstr "Breyti hársnyrti"
 
 #. item "Shops/Hairdresser" text "Name"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2491
 msgid "Shoes"
 msgstr "Skóbúð"
 
 #. item
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2492
 msgid "Edit Shoe Shop"
 msgstr "Breyti skóbúð"
 
 #. item "Shops/Shoes" text "Name"
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2496
 msgid "Toys"
 msgstr "Dótabúð"
 
 #. item
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2497
 msgid "Edit Toy Shop"
 msgstr "Breyti dótabúð"
 
 #. item "Shops/Toys" text "Name"
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2501
 msgid "Video"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2502
 msgid "Edit Video Shop"
 msgstr ""
 
 #. item "Shops/Video" text "Name"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2506
 msgid "Dry Cleaning"
 msgstr "Efnalaug"
@@ -16568,10 +16930,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 "Breyti efnalaug"
 
 #. item "Shops/Dry Cleaning" text "Name"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2512
 msgid "Laundry"
 msgstr "Þvottahús"
@@ -16579,10 +16941,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 "Breyti þvottahúsi"
 
 #. item "Shops/Laundry" text "Name"
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2518
 msgid "Outdoor"
 msgstr "Útivistarbúð"
@@ -16590,35 +16952,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 "Breyti útivistarbúð"
 
 #. item "Shops/Outdoor" text "Name"
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2524
 msgid "Sports"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2525
 msgid "Edit Sports Shop"
 msgstr ""
 
 #. item "Shops/Sports" text "Name"
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2529
 msgid "Optician"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2530
 msgid "Edit Optician"
 msgstr "Breyti sjóntækjasmið"
 
 #. item "Shops/Optician" text "Name"
-#: build/trans_presets.java:2535
+#: build/trans_presets.java:2536
 msgid "Cash"
 msgstr "Fjármál"
 
 #. group "Cash"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2537
 msgid "Bank"
 msgstr "Banki"
@@ -16626,5 +16988,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 "Breyti banka"
@@ -16632,10 +16994,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 "Hraðbanki"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2544
 msgid "Money Exchange"
 msgstr "Gjaldeyrisskipti"
@@ -16643,5 +17005,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 "Breyti gjaldeyrisskiptum"
@@ -16649,15 +17011,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 "Breyti hraðbanka"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2557
 msgid "Health"
 msgstr "Heilsa"
 
 #. group "Health"
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2558
 msgid "Doctors"
 msgstr "Læknir"
@@ -16665,20 +17027,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 "Breyti lækni"
 
 #. item "Health/Doctors" text "Name"
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2564
 msgid "Dentist"
 msgstr "Tannlæknir"
 
 #. item
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2565
 msgid "Edit Dentist"
 msgstr "Breyti tannlækni"
 
 #. item "Health/Dentist" text "Name"
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2569
 msgid "Pharmacy"
 msgstr "Apótek"
@@ -16686,5 +17048,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 "Apótek"
@@ -16692,10 +17054,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 ""
 
 #. item "Health/Pharmacy" text "Name"
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2576
 msgid "Hospital"
 msgstr "Spítali"
@@ -16703,10 +17065,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 "Breyti spítala"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2582
 msgid "Emergency Access Point"
 msgstr ""
@@ -16715,5 +17077,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 ""
@@ -16722,20 +17084,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2588
 msgid "Point Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2589
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2591
 msgid "Phone Number"
 msgstr ""
 
 #. 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 ""
@@ -16743,5 +17105,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 "Dýralæknir"
@@ -16750,25 +17112,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 "Breyti dýralækni"
 
 #. group "Places"
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2605
 msgid "Continent"
 msgstr "Heimsálfa"
 
 #. item
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2606
 msgid "Edit Continent"
 msgstr "Breyti heimsálfu"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2611
 msgid "Country"
 msgstr "Land"
 
 #. item
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2612
 msgid "Edit Country"
 msgstr "Breyti landi"
@@ -16776,30 +17138,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 "Fylki"
 
 #. item
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2618
 msgid "Edit State"
 msgstr "Breyti fylki"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2622
+#: build/trans_presets.java:2623
 msgid "Region"
 msgstr "Svæði"
 
 #. item
-#: build/trans_presets.java:2623
+#: build/trans_presets.java:2624
 msgid "Edit Region"
 msgstr "Breyti svæði"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2628
+#: build/trans_presets.java:2629
 msgid "County"
 msgstr "Sýsla"
 
 #. item
-#: build/trans_presets.java:2629
+#: build/trans_presets.java:2630
 msgid "Edit County"
 msgstr "Breyti sýslu"
@@ -16807,15 +17169,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2635
+#: build/trans_presets.java:2636
 msgid "City"
 msgstr "Borg"
 
 #. item
-#: build/trans_presets.java:2636
+#: build/trans_presets.java:2637
 msgid "Edit City"
 msgstr "Breyti borg"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2641
+#: build/trans_presets.java:2642
 msgid "Town"
 msgstr "Bær"
@@ -16823,10 +17185,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 "Breyti bæ"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2649
 msgid "Suburb"
 msgstr "Hverfi"
@@ -16834,25 +17196,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 "Breyti hverfi"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2656
 msgid "Village"
 msgstr "Þorp"
 
 #. item
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2657
 msgid "Edit Village"
 msgstr "Breyti þorpi"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2662
 msgid "Hamlet"
 msgstr "Smáþorp"
 
 #. item
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2663
 msgid "Edit Hamlet"
 msgstr "Breyti smáþorpi"
@@ -16860,5 +17222,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2669
 msgid "Locality"
 msgstr ""
@@ -16866,10 +17228,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 ""
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2676
 msgid "Island"
 msgstr "Eyja"
@@ -16877,5 +17239,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 "Breyti eyju"
@@ -16883,5 +17245,5 @@
 #. item "Places/Island" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2683
+#: build/trans_presets.java:2684
 msgid "Cave Entrance"
 msgstr "Hellismunni"
@@ -16889,10 +17251,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 "Breyti hellismunna"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2690
 msgid "Peak"
 msgstr "Tindur"
@@ -16900,10 +17262,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 "Breyti tind"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2697
 msgid "Glacier"
 msgstr "Jökull"
@@ -16911,10 +17273,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 "Breyti jökli"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2703
+#: build/trans_presets.java:2704
 msgid "Volcano"
 msgstr "Eldfjall"
@@ -16922,70 +17284,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 "Breyti eldfjalli"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2711
+#: build/trans_presets.java:2712
 msgid "Boundaries"
 msgstr ""
 
 #. group "Boundaries"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2713
 msgid "National"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2714
 msgid "Edit National Boundary"
 msgstr ""
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2718
+#: build/trans_presets.java:2719
 msgid "Administrative"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2720
 msgid "Edit Administrative Boundary"
 msgstr ""
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2724
+#: build/trans_presets.java:2725
 msgid "Civil"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2725
+#: build/trans_presets.java:2726
 msgid "Edit Civil Boundary"
 msgstr ""
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2730
+#: build/trans_presets.java:2731
 msgid "Political"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:2732
 msgid "Edit Political Boundary"
 msgstr ""
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2736
+#: build/trans_presets.java:2737
 msgid "National park"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2737
+#: build/trans_presets.java:2738
 msgid "Edit National Park Boundary"
 msgstr "Breyti landamærum þjóðgarðs"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2744
 msgid "Land use"
 msgstr "Landnýting"
 
 #. group "Land use"
-#: build/trans_presets.java:2744
+#: build/trans_presets.java:2745
 msgid "Tree"
 msgstr "Tré"
@@ -16994,15 +17356,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 "Breyti tré"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2753
 msgid "Botanical Name"
 msgstr "Fræðiheiti"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2755
 msgid "Wood"
 msgstr "Skógur"
@@ -17011,5 +17373,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 "Breyti skóg"
@@ -17017,17 +17379,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 "barrskógur"
 
-#: build/trans_presets.java:2760 build/trans_presets.java:2769
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
 msgid "deciduous"
 msgstr "laufskógur"
 
-#: build/trans_presets.java:2760 build/trans_presets.java:2769
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
 msgid "mixed"
 msgstr "blandaður"
 
-#: build/trans_presets.java:2762
+#: build/trans_presets.java:2763
 msgid "Forest"
 msgstr "Skógur (ræktaður)"
@@ -17036,14 +17398,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 "Breyti ræktuðum skóg"
 
-#: build/trans_presets.java:2771
+#: build/trans_presets.java:2772
 msgid "Nature Reserve"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2773
 msgid "Edit Nature Reserve"
 msgstr ""
@@ -17051,25 +17413,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2777
+#: build/trans_presets.java:2778
 msgid "Scree"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:2779
 msgid "Edit Scree"
 msgstr ""
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2783
 msgid "Scrub"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2783
+#: build/trans_presets.java:2784
 msgid "Edit Scrub"
 msgstr ""
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2788
 msgid "Fell"
 msgstr ""
@@ -17077,10 +17439,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 ""
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2794
 msgid "Heath"
 msgstr ""
@@ -17088,5 +17450,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 ""
@@ -17094,5 +17456,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2801
 msgid "Farmyard"
 msgstr ""
@@ -17101,45 +17463,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 ""
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2808
+#: build/trans_presets.java:2809
 msgid "Farmland"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2810
 msgid "Edit Farmland Landuse"
 msgstr ""
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2814
+#: build/trans_presets.java:2815
 msgid "Meadow"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2816
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2820
+#: build/trans_presets.java:2821
 msgid "Vineyard"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2822
 msgid "Edit Vineyard Landuse"
 msgstr ""
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2826
+#: build/trans_presets.java:2827
 msgid "Allotments"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:2828
 msgid "Edit Allotments Landuse"
 msgstr ""
@@ -17147,25 +17509,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2833
+#: build/trans_presets.java:2834
 msgid "Garden"
 msgstr "Garður"
 
 #. item
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2835
 msgid "Edit Garden"
 msgstr "Breyti garði"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2838
+#: build/trans_presets.java:2839
 msgid "Grass"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2839
+#: build/trans_presets.java:2840
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2845
 msgid "Village Green"
 msgstr ""
@@ -17173,10 +17535,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 ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:2852
 msgid "Common"
 msgstr ""
@@ -17184,20 +17546,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 ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2858
 msgid "Park"
 msgstr "Almenningsgarður"
 
 #. item
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:2859
 msgid "Edit Park"
 msgstr "Breyti almenningsgarð"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2863
 msgid "Recreation Ground"
 msgstr ""
@@ -17205,5 +17567,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 ""
@@ -17211,15 +17573,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2871
 msgid "Residential area"
 msgstr "Íbúðarsvæði"
 
 #. item
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2872
 msgid "Edit Residential Landuse"
 msgstr "Breyti íbúðarlandnýtingu"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2877
 msgid "Graveyard"
 msgstr "Grafreitur"
@@ -17227,9 +17589,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 "Breyti grafreit"
 
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:2885
 msgid "Cemetery"
 msgstr ""
@@ -17237,39 +17599,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 "Breyti kirkjugarðslandnýtingu"
 
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2894
 msgid "Retail"
 msgstr "Smásala"
 
 #. item
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2895
 msgid "Edit Retail Landuse"
 msgstr "Breyti smásölulandnýtingu"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2900
 msgid "Commercial"
 msgstr "Skrifstofur"
 
 #. item
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2901
 msgid "Edit Commercial Landuse"
 msgstr "Breyti skrifstofulandnýtingu"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2906
 msgid "Industrial"
 msgstr "Iðnaður"
 
 #. item
-#: build/trans_presets.java:2906
+#: build/trans_presets.java:2907
 msgid "Edit Industrial Landuse"
 msgstr "Breyti iðnaðarlandnýtingu"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2912
 msgid "Railway land"
 msgstr ""
@@ -17277,15 +17639,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 ""
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:2919
 msgid "Military"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2920
 msgid "Edit Military Landuse"
 msgstr ""
@@ -17293,55 +17655,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2925
+#: build/trans_presets.java:2926
 msgid "Construction area"
 msgstr "Byggingarsvæði"
 
 #. item
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2927
 msgid "Edit Construction Landuse"
 msgstr "Breyti byggingarsvæðislandnýtingu"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2932
 msgid "Brownfield"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:2933
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2937
+#: build/trans_presets.java:2938
 msgid "Greenfield"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:2939
 msgid "Edit Greenfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:2944
 msgid "Landfill"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:2945
 msgid "Edit Landfill Landuse"
 msgstr ""
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2950
 msgid "Quarry"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2950
+#: build/trans_presets.java:2951
 msgid "Edit Quarry Landuse"
 msgstr ""
 
 #. group "Relations"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2960
 msgid "Multipolygon"
 msgstr ""
@@ -17351,5 +17713,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 ""
@@ -17358,10 +17720,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:2970
 msgid "outer segment"
 msgstr ""
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:2970
+#: build/trans_presets.java:2971
 msgid "inner segment"
 msgstr ""
@@ -17369,5 +17731,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:2974
 msgid "Turn restriction"
 msgstr ""
@@ -17376,5 +17738,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 ""
@@ -17382,34 +17744,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 ""
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_straight_on"
 msgstr ""
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_u_turn"
 msgstr ""
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "only_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "only_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "only_straight_on"
 msgstr "aðeins_beint_fram"
@@ -17418,15 +17780,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2983
+#: build/trans_presets.java:2984
 msgid "from way"
 msgstr "af vegi"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2985
 msgid "via node or way"
 msgstr "gegnum hnút eða veg"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2986
 msgid "to way"
 msgstr "að vegi"
@@ -17434,5 +17796,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:2988
+#: build/trans_presets.java:2989
 msgid "Route"
 msgstr ""
@@ -17441,5 +17803,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 ""
@@ -17447,5 +17809,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 ""
@@ -17517,5 +17879,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
@@ -17524,17 +17886,17 @@
 msgstr "hjól"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "bus"
 msgstr ""
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "ski"
 msgstr ""
@@ -17587,5 +17949,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
@@ -17594,13 +17956,13 @@
 msgstr "fótgangandi"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "hiking"
 msgstr ""
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "detour"
 msgstr ""
@@ -17614,10 +17976,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 ""
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:2997
 msgid "Symbol description"
 msgstr ""
@@ -17625,26 +17987,26 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:2999
+#: build/trans_presets.java:3000
 msgid "Network"
 msgstr ""
 
 #. item "Relations/Route" combo "State"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3003
 msgid "Color (hex)"
 msgstr ""
@@ -17653,30 +18015,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:3006
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3007
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3008
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3009
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3010
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3011
 msgid "backward halt point"
 msgstr ""
@@ -21791,6 +22153,23 @@
 msgstr ""
 
+#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
+#~ msgstr ""
+#~ "Þú getur notað músina eða Ctrl+örvarlykla/./ til að þysja og hliðra."
+
 #~ msgid "Uploading data"
 #~ msgstr "Hleð upp gögnum"
+
+#~ msgid "Email"
+#~ msgstr "Netfang"
+
+#~ msgid "OSM username (email)"
+#~ msgstr "OSM notandanafn (getur verið tölvupóstfang)"
+
+#~ msgid ""
+#~ "Server returned internal error. Try a reduced area or retry after waiting "
+#~ "some time."
+#~ msgstr ""
+#~ "Það kom upp innri villa á þjóninum. Prófaðu að hala niður minna svæði eða "
+#~ "reyna síðar."
 
 #~ msgid "Commit comment"
@@ -21824,4 +22203,7 @@
 #~ msgstr "Uppfæra þarf JOSM til að viðbótin „{0}“ geti verið notuð."
 
+#~ msgid "Open the OpenStreetBugs window and activate the automatic download"
+#~ msgstr "Opna OpenStreetBugs gluggann og virkja sjálfvirkt niðurhal paddna."
+
 #~ msgid "sports"
 #~ msgstr "íþróttir"
Index: applications/editors/josm/i18n/po/it.po
===================================================================
--- applications/editors/josm/i18n/po/it.po	(revision 16008)
+++ applications/editors/josm/i18n/po/it.po	(revision 16009)
@@ -5,7 +5,7 @@
 "Project-Id-Version: josm 20081003\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-14 16:51+0200\n"
-"PO-Revision-Date: 2009-06-10 09:34+0000\n"
-"Last-Translator: Davide Prade <davalv@alice.it>\n"
+"POT-Creation-Date: 2009-06-19 21:52+0200\n"
+"PO-Revision-Date: 2009-06-18 07:36+0000\n"
+"Last-Translator: Fabrizio Lorenzini <Unknown>\n"
 "Language-Team: Italian <talk-it@lists.openstreetmap.org>\n"
 "MIME-Version: 1.0\n"
@@ -13,5 +13,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:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -24,11 +24,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 "Aiuto"
 
 #: ../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 ""
 "La proiezione non può essere letta dalle preferenze. Verrà utilizzata quella "
@@ -72,6 +72,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
@@ -88,8 +90,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
@@ -138,5 +140,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"
@@ -539,5 +541,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}"
@@ -609,6 +611,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:92
-msgid "Email"
-msgstr "Email"
+msgid "E-Mail"
+msgstr "E-Mail"
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:96
@@ -646,12 +648,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
@@ -678,5 +682,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
@@ -710,15 +714,13 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:207
 #, java-format
-msgid "Helppage missing. Create it in <A HREF=\"{0}\">english</A>."
-msgstr "Pagina di aiuto mancante. Crearla in <A HREF=\"{0}\">italiano</A>."
+msgid "Help page missing. Create it in <A HREF=\"{0}\">english</A>."
+msgstr "Pagina di help mancante. Creala in <A HREF=\"{0}\">italiano</A>."
 
 #: ../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 ""
-"Pagina di aiuto mancante. crearla in <A HREF=\"{0}\">italiano</A> oppure <A "
-"HREF=\"{1}\">la propria lingua</A>."
 
 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:26
@@ -1150,13 +1152,13 @@
 msgstr "Aiuto: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:99
 msgid "Status Report"
 msgstr "Rapporto dello stato"
 
-#: ../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 "Copia negli appunti e chiudi"
 
-#: ../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
@@ -1360,12 +1362,10 @@
 msgstr "Deseleziona tutto (al di fuori)"
 
-#: ../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 "Aggiorna dati"
 
-#: ../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 ""
@@ -1373,5 +1373,5 @@
 "dati)"
 
-#: ../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?"
@@ -1380,88 +1380,258 @@
 "scaricato un livello dati?"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:70
+msgid "Undeleting Way..."
+msgstr "Ripristino via"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:133
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:247
+msgid "Yes, undelete them too"
+msgstr "Si, ripristina anche questo"
+
+#: ../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 ""
-"Questa azione richiederà {0} richieste individuali di scaricamento. Si "
-"desidera continuare?"
-
-#: ../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 "Ripristino relazione..."
+
+#: ../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 "Carica su OSM..."
 
-#: ../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 "Carica tutti i cambiamenti sul server OSM."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:96
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:94
 msgid "Objects to add:"
 msgstr "Oggetti da aggiungere:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102
 msgid "Objects to modify:"
 msgstr "Oggetti da modificare:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:110
 msgid "Objects to delete:"
 msgstr "Oggetti da eliminare:"
 
-#: ../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 "Crea un breve commento ai cambiamenti che sta caricando:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:126
 msgid "Upload these changes?"
 msgstr "Caricare questi cambiamenti?"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:130
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
 msgid "Upload Changes"
 msgstr "Carica le modifiche"
 
-#: ../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 "Niente da caricare. Prima è necessario ottenere dei dati."
 
-#: ../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 "Ci sono dei conflitti non risolti. Prima è necessario risolverli."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:182
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:180
 msgid "No changes to upload."
 msgstr "Nessun cambiamento da caricare."
 
-#: ../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
+msgstr "Invio in corso"
+
+#: ../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
+msgstr "Invio alle API di OSM fallito"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:552
 #, java-format
 msgid ""
@@ -1570,38 +1740,51 @@
 msgstr "Dati GPS grezzi"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:44
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:46
 msgid "Downloading data"
 msgstr "Scaricamento dei dati"
 
-#: ../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 "Nessun dato importato."
 
-#: ../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 "Livello dati {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 "Dati OpenStreetMap"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:37
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:45
 msgid "Data Layer"
 msgstr "Livello dati"
 
-#: ../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 "Scaricamento di {0} su {1} ({2} rimanenti)"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:88
-msgid "The following errors occured during mass download:"
-msgstr ""
-"Sono stati rilevati i seguenti errori durante lo scaricamento di massa:"
-
-#: ../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 "Errori durante lo scaricamento"
+
+#: ../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
@@ -1655,34 +1838,34 @@
 msgstr "Non si può disegnare un nodo fuori dal mondo."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:495
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:493
 msgid "Add node"
 msgstr "Aggiungi nodo"
 
-#: ../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 "Aggiungi un nodo al percorso"
 
-#: ../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 "Collega un percorso esistente al nodo"
 
-#: ../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 "Aggiungi un nodo ad un percorso esistente"
 
-#: ../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 "Aggiungi un nodo al percorso e connetti"
 
-#: ../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 "Crea un nuovo nodo."
 
-#: ../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 "Seleziona il nodo sotto il cursore."
 
-#: ../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."
@@ -1691,14 +1874,14 @@
 msgstr[1] "Inserisci un nuovo nodo nei {0} percorsi."
 
-#: ../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 "Inizia un nuovo percorso dall'ultimo nodo."
 
-#: ../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 "Continua un percorso dall'ultimo nodo."
 
-#: ../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 "Termina tracciamento."
@@ -2048,26 +2231,32 @@
 msgstr "Valore non corretto per l''operatore id: {0}. E' atteso un numero."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:33
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:34
 msgid "Load Selection"
 msgstr "Carica selezione"
 
-#: ../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 "Collegamento a {0} in corso..."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:45
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:46
 msgid "Downloading..."
 msgstr "Scaricamento in corso..."
 
-#: ../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 "Impossibile leggere \"{0}\""
 
-#: ../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 "Errore nell'interpretazione dei dati dell'indirizzo URL: \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:74
+msgid "Error while communicating with server."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67
@@ -2128,13 +2317,85 @@
 msgstr "Risolvere {0} conflitti in {1} oggetti"
 
-#: ../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 "Risolvi conflitti nelle coordinate in {0}"
+
+#. 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 "non è possibile risolvere il conflitto irrisolto"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81
+#, java-format
+msgid "Delete {1} {0}"
+msgstr "Cancella {1} {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97
+#, java-format
+msgid "Delete {0} {1}"
+msgstr "Cancella {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153
+msgid "Conflicting relation"
+msgstr "Conflitto tra relazioni"
+
+#: ../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 ""
+"La selezione \"{0}\" è usata dalla relazione \"{1}\" con le regole {2}.\n"
+"Cancellare dalla relazione?"
+
+#: ../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 "Elimina dalla relazione"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
+#, java-format
+msgid ""
+"Selection \"{0}\" is used by relation \"{1}\".\n"
+"Delete from relation?"
+msgstr ""
+"La selezione \"{0}\" è usata dalla relazione \"{1}\".\n"
+"Cancellare dalla relazione?"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:366
+msgid "Split way segment"
+msgstr "Dividi il segmento del percorso"
+
+#. 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 ""
+"Stai per cancellare dei nodi fuori dall'area scaricata.<br>Questo potrebbe "
+"causare dei problemi poiché i nodi potrebbero far parte di altri oggetti "
+"(che non puoi vedere).<br>Vuoi veramente cancellarli?"
+
+#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:53
+#, java-format
+msgid "Resolve conflicts in deleted state in {0}"
+msgstr "Risolvi conflitti nello stato eliminato in {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118
+msgid "Move"
+msgstr "Sposta"
+
 #: ../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"
@@ -2143,10 +2404,222 @@
 msgstr[1] "nodi"
 
-#: ../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 "Rimuovi un membro dalla relazione"
+
+#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
+msgid "Rotate"
+msgstr "Ruota"
+
+#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88
+msgid "Sequence"
+msgstr "Sequenza"
+
+#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:72
+#, java-format
+msgid "Resolve {0} tag conflicts in {1} {2}"
+msgstr "Risolvi {0} conflitti sulle etichette in {1} {2}"
+
+#: ../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 "Risolvi i conflitti di versione per {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52
+#, java-format
+msgid "Resolve conflicts in node list of of way {0}"
+msgstr "Risolvi i conflitti nella lista di nodi del percorso {0}"
+
+#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
+msgid "Apply?"
+msgstr "Applicare?"
+
+#: ../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 ""
+"Invertendo la direzione di questo percorso si consiglia di apportare i "
+"seguenti cambiamenti alle proprietà del percorso in modo da mantenere la "
+"consistenza dei dati."
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28
+msgid "Relation"
+msgstr "Relazione"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30
+msgid "Old role"
+msgstr "Vecchia regola"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:32
+msgid "New role"
+msgstr "Nuova regola"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
+msgid "Old key"
+msgstr "Chiave precedente"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
+msgid "Old value"
+msgstr "Valore precedente"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
+msgid "New key"
+msgstr "Nuova chiave"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
+msgid "New value"
+msgstr "Nuovo valore"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:40
+msgid "Apply selected changes"
+msgstr "Applica i cambiamenti selezionati"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41
+msgid "Don't apply changes"
+msgstr "Non applicare cambiamenti"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:83
+msgid "Please select which property changes you want to apply."
+msgstr "Selezionare quali cambiamenti alle proprietà si vogliono applicare."
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:96
+msgid "Properties of "
+msgstr "Proprietà di "
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:120
+msgid "Roles in relations referring to"
+msgstr "Regole nelle relazioni a cui si riferiscono"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:136
+msgid "Automatic tag correction"
+msgstr "Correzione automatica etichette"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:314
+#, java-format
+msgid "Malformed config file at lines {0}"
+msgstr "Errore di formato nel file di configurazione alla linea {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:324
+#, java-format
+msgid "Cannot open preferences directory: {0}"
+msgstr "Impossibile aprire la cartella delle preferenze: {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 ""
+"Il file delle preferenze contiene degli errori. Copia di backup del vecchio "
+"file su {0}."
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:79
+#, java-format
+msgid "Preferences stored on {0}"
+msgstr "Preferenze salvate in {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:82
+#, java-format
+msgid "Could not upload preferences. Reason: {0}"
+msgstr "Impossibile caricare le preferenze. Motivo: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:93
+msgid "Could not load preferences from server."
+msgstr "Impossibile scaricare le preferenze dal server."
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:34
+msgid "different"
+msgstr "diverso"
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:262
+msgid "deleted"
+msgstr "cancellato"
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
+msgid "true"
+msgstr "vero"
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
+msgid "false"
+msgstr "falso"
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20
+msgid "position"
+msgstr "posizione"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30
+msgid "Decimal Degrees"
+msgstr "Gradi Decimali"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
+msgid "Degrees Minutes Seconds"
+msgstr "Gradi Minuti Secondi"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+msgid "S"
+msgstr "S"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+msgid "N"
+msgstr "N"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+msgid "W"
+msgstr "O"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+msgid "E"
+msgstr "E"
+
+#: ../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 "incompleto"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
+#, java-format
+msgid "Error: {0}"
+msgstr "Errore: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
+#, java-format
+msgid "Warning: {0}"
+msgstr "Attenzione: {0}"
+
+#: ../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"
@@ -2155,8 +2628,10 @@
 msgstr[1] "percorsi"
 
-#: ../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
@@ -2167,268 +2642,27 @@
 msgstr[1] "relazioni"
 
-#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:68
-#, java-format
-msgid "Resolve conflicts in coordinates in {0}"
-msgstr "Risolvi conflitti nelle coordinate in {0}"
-
-#. 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 "non è possibile risolvere il conflitto irrisolto"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81
-#, java-format
-msgid "Delete {1} {0}"
-msgstr "Cancella {1} {0}"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97
-#, java-format
-msgid "Delete {0} {1}"
-msgstr "Cancella {0} {1}"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153
-msgid "Conflicting relation"
-msgstr "Conflitto tra relazioni"
-
-#: ../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 ""
-"La selezione \"{0}\" è usata dalla relazione \"{1}\" con le regole {2}.\n"
-"Cancellare dalla relazione?"
-
-#: ../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 "Elimina dalla relazione"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
-#, java-format
-msgid ""
-"Selection \"{0}\" is used by relation \"{1}\".\n"
-"Delete from relation?"
-msgstr ""
-"La selezione \"{0}\" è usata dalla relazione \"{1}\".\n"
-"Cancellare dalla relazione?"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:366
-msgid "Split way segment"
-msgstr "Dividi il segmento del percorso"
-
-#. 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 ""
-"Stai per cancellare dei nodi fuori dall'area scaricata.<br>Questo potrebbe "
-"causare dei problemi poiché i nodi potrebbero far parte di altri oggetti "
-"(che non puoi vedere).<br>Vuoi veramente cancellarli?"
-
-#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:53
-#, java-format
-msgid "Resolve conflicts in deleted state in {0}"
-msgstr "Risolvi conflitti nello stato eliminato in {0}"
-
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118
-msgid "Move"
-msgstr "Sposta"
-
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:52
-#, java-format
-msgid "Resolve conflicts in member list of of relation {0}"
-msgstr "Risolvi conflitti nella lista dei membri della relazione {0}"
-
-#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66
-msgid "RemoveRelationMember"
-msgstr "Rimuovi un membro dalla relazione"
-
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
-msgid "Rotate"
-msgstr "Ruota"
-
-#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88
-msgid "Sequence"
-msgstr "Sequenza"
-
-#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:84
-#, java-format
-msgid "Resolve {0} tag conflicts in {1} {2}"
-msgstr "Risolvi {0} conflitti sulle etichette in {1} {2}"
-
-#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:57
-#, java-format
-msgid "Resolve version conflicts for {0} {1}"
-msgstr "Risolvi i conflitti di versione per {0} {1}"
-
-#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52
-#, java-format
-msgid "Resolve conflicts in node list of of way {0}"
-msgstr "Risolvi i conflitti nella lista di nodi del percorso {0}"
-
-#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
-msgid "Apply?"
-msgstr "Applicare?"
-
-#: ../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 ""
-"Invertendo la direzione di questo percorso si consiglia di apportare i "
-"seguenti cambiamenti alle proprietà del percorso in modo da mantenere la "
-"consistenza dei dati."
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28
-msgid "Relation"
-msgstr "Relazione"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30
-msgid "Old role"
-msgstr "Vecchia regola"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:32
-msgid "New role"
-msgstr "Nuova regola"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
-msgid "Old key"
-msgstr "Chiave precedente"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
-msgid "Old value"
-msgstr "Valore precedente"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
-msgid "New key"
-msgstr "Nuova chiave"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
-msgid "New value"
-msgstr "Nuovo valore"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:40
-msgid "Apply selected changes"
-msgstr "Applica i cambiamenti selezionati"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41
-msgid "Don't apply changes"
-msgstr "Non applicare cambiamenti"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:83
-msgid "Please select which property changes you want to apply."
-msgstr "Selezionare quali cambiamenti alle proprietà si vogliono applicare."
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:96
-msgid "Properties of "
-msgstr "Proprietà di "
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:120
-msgid "Roles in relations referring to"
-msgstr "Regole nelle relazioni a cui si riferiscono"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:136
-msgid "Automatic tag correction"
-msgstr "Correzione automatica etichette"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:314
-#, java-format
-msgid "Malformed config file at lines {0}"
-msgstr "Errore di formato nel file di configurazione alla linea {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:324
-#, java-format
-msgid "Cannot open preferences directory: {0}"
-msgstr "Impossibile aprire la cartella delle preferenze: {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 ""
-"Il file delle preferenze contiene degli errori. Copia di backup del vecchio "
-"file su {0}."
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:79
-#, java-format
-msgid "Preferences stored on {0}"
-msgstr "Preferenze salvate in {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:82
-#, java-format
-msgid "Could not upload preferences. Reason: {0}"
-msgstr "Impossibile caricare le preferenze. Motivo: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:93
-msgid "Could not load preferences from server."
-msgstr "Impossibile scaricare le preferenze dal server."
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:34
-msgid "different"
-msgstr "diverso"
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:262
-msgid "deleted"
-msgstr "cancellato"
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
-msgid "true"
-msgstr "vero"
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
-msgid "false"
-msgstr "falso"
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20
-msgid "position"
-msgstr "posizione"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30
-msgid "Decimal Degrees"
-msgstr "Gradi Decimali"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
-msgid "Degrees Minutes Seconds"
-msgstr "Gradi Minuti Secondi"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
-msgid "S"
-msgstr "S"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
-msgid "N"
-msgstr "N"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
-msgid "W"
-msgstr "O"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
-msgid "E"
-msgstr "E"
-
-#: ../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 "incompleto"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
-#, java-format
-msgid "Error: {0}"
-msgstr "Errore: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
-#, java-format
-msgid "Warning: {0}"
-msgstr "Attenzione: {0}"
-
-#: ../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"
@@ -2442,5 +2676,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:122
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "railway"
 msgstr "ferrovia"
@@ -2462,4 +2696,62 @@
 msgstr[1] "{0} nodi"
 
+#: ../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."
@@ -2607,5 +2899,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 "sfondo"
@@ -2694,8 +2986,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
@@ -2707,7 +2999,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
@@ -2814,10 +3106,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 "Nome utente"
 
 #: ../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 "Password"
@@ -2918,22 +3210,22 @@
 "più usata."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:146
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148
 msgid "File"
 msgstr "File"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150
 msgid "View"
 msgstr "Visualizza"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:149
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151
 msgid "Tools"
 msgstr "Strumenti"
 
-#: ../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 "Preimpostati"
 
-#: ../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
@@ -2946,21 +3238,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 "Visualizzazione a fil di ferro"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:218
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221
 msgid "Toggle Wireframe view"
 msgstr "Abilita/disabilita la visualizzazione a fil di ferro"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:244
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:247
 msgid "Full Screen"
 msgstr "Schermo pieno"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:246
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:249
 msgid "Toggle Full Screen view"
 msgstr "Abilita/disabilita visualizzazione a schermo pieno"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:286
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:289
 msgid "Audio"
 msgstr "Audio"
@@ -3032,6 +3324,6 @@
 msgstr "(nessun oggetto)"
 
-#: ../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 "livello non in lista."
@@ -3041,9 +3333,9 @@
 msgstr "Connessione al server OSM..."
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:104
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:105
 msgid "Error while parsing"
 msgstr "Impossibile interpretare"
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:107
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:108
 msgid "File not found"
 msgstr "File non trovato"
@@ -3116,5 +3408,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 "Membri"
@@ -3332,5 +3624,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
@@ -3416,5 +3708,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 "il parametro '{0}' non deve essere nullo"
@@ -3458,9 +3750,6 @@
 msgid ""
 "Properties in the merged element. They will replace properties in my "
-"elements when  merge decisions are applied."
-msgstr ""
-"Proprietà nell'elemento unito. Queste sostituiranno le proprietà presenti "
-"negli elementi personali non appena saranno applicate le decisioni "
-"sull'unione."
+"elements when merge decisions are applied."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88
@@ -3513,5 +3802,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 "Ruolo"
@@ -3622,5 +3911,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
@@ -3939,5 +4228,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 "Relazioni"
@@ -4046,67 +4335,67 @@
 
 #. 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 "Applica cambiamenti"
 
-#: ../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 "Di base"
 
-#: ../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 "Occupato da"
 
-#: ../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 "collegato"
 
-#: ../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 "Etichette (un valore vuoto cancella l'etichetta)"
 
-#: ../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 "Sposta in alto"
 
-#: ../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 "Sposta in alto i membri attualmente selezionati"
 
-#: ../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 "Aggiungi la selezione"
 
-#: ../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 "Aggiungi tutti gli oggetti selezionati come membri"
 
-#: ../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 "Elimina gli elementi selezionati"
 
-#: ../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 "Rimuovi dalla relazione gli elementi selezionati"
 
-#: ../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 "Sposta in basso"
 
-#: ../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 "Sposta in basso i membri attualmente selezionati"
 
-#: ../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 ""
 "Cancella il membro dalla riga della tabella utilizzata da questa relazione"
 
-#: ../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 "Scarica i membri"
 
-#: ../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 "Scarica tutti i percorsi ed i nodi incompleti di questa relazione"
@@ -4151,5 +4440,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
@@ -4170,9 +4459,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 "si"
 
-#: ../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
@@ -4194,31 +4483,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 "no"
 
-#: ../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 "Membri: {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 "Editor relazione: {0}"
 
-#: ../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 "Si sono verificati dei conflitti durante l'importazione."
 
-#: ../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 "Errore di scansione nella risposta del server."
 
-#: ../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 "Impossibile connettersi al server."
+
+#: ../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
@@ -4284,13 +4576,13 @@
 msgstr "Sorgenti di dati e tipi"
 
-#: ../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 "Scarica come nuovo layer"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:174
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:173
 msgid "Download Area"
 msgstr "Area da scaricare"
 
-#: ../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 ""
@@ -4298,5 +4590,5 @@
 "dal server"
 
-#: ../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 "Area da scaricare corretta, sarà probabilmente accettata dal server"
@@ -4324,5 +4616,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 "Luoghi"
@@ -4369,21 +4661,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 "tipo"
@@ -4423,16 +4715,4 @@
 msgid "Tile Numbers"
 msgstr "Numeri dei tasselli"
-
-#: ../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 ""
-"Per spostare, ingrandire e rimpicciolire la mappa puoi usare il mouse oppure "
-"premere Ctrl e le frecce, il punto (.) e la virgola (,)."
-
-#. 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 "Mappa"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:98
@@ -4511,5 +4791,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)"
@@ -4625,14 +4905,14 @@
 msgstr "Files audio Wave (*.wav)"
 
-#: ../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 "Marcatori audio da {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244
 msgid "Import images"
 msgstr "Importa immagini"
 
-#: ../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, "
@@ -4641,5 +4921,5 @@
 msgstr[1] "{0} percorsi, "
 
-#: ../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, "
@@ -4648,5 +4928,5 @@
 msgstr[1] "{0} percorsi, "
 
-#: ../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"
@@ -4655,28 +4935,28 @@
 msgstr[1] "{0} punti del percorso"
 
-#: ../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 "Nome: {0}"
 
-#: ../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 "Descrizione: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347
 msgid "Timespan: "
 msgstr "Timespan/Arco di tempo: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354
 msgid "Length: "
 msgstr "Lunghezza: "
 
-#: ../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 "Converti in livello dati"
 
-#: ../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 ""
@@ -4687,11 +4967,11 @@
 "considerato dannoso.<br>Se si desidera caricare delle tracce, vedere qui:"
 
-#: ../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
@@ -4701,29 +4981,29 @@
 msgstr "Convertito da: {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 "Scarica da OSM lungo questo tracciato"
 
-#: ../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 "Scarica tutto entro:"
 
-#: ../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 "{0} metri"
 
-#: ../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 "Area massima per richiesta:"
 
-#: ../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 "{0} km quadrati"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:822
 #, java-format
 msgid ""
@@ -4734,9 +5014,9 @@
 "vuole procedere?</html>"
 
-#: ../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 "Nessuna traccia GPX da associare con l'audio."
 
-#: ../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 "
@@ -4747,5 +5027,5 @@
 "all'inizio."
 
-#: ../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 "
@@ -4755,33 +5035,42 @@
 "tracciato per poter essere giustamente calcolati."
 
-#: ../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 "al di fuori dell'area scaricata"
 
-#: ../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 "versione {0}"
 
-#: ../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 "{0} è composto da:"
 
-#: ../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} eliminati)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:371
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:396
 msgid "unset"
 msgstr "disattiva"
 
-#: ../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 "Versione delle API: {0}"
 
-#: ../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"
@@ -4789,21 +5078,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"
@@ -4951,5 +5240,5 @@
 "Il valore di default è sconosciuto (l'impostazione non è stata ancora usata)."
 
-#: ../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
@@ -4958,5 +5247,5 @@
 msgstr "Scegli la riga da modificare."
 
-#: ../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
@@ -4964,5 +5253,5 @@
 msgstr "Nuovo valore per {0}"
 
-#: ../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
@@ -4972,5 +5261,5 @@
 msgstr "Scegli la riga da cancellare."
 
-#: ../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 "Inserisci una nuova coppia chiave/valore"
@@ -5870,106 +6159,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 "Nome"
@@ -6461,6 +6750,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:36
-msgid "Login name (email) to the OSM account."
-msgstr "Nome utente (email) per l'account di OSM."
+msgid "Login name (e-mail) to the OSM account."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
@@ -6476,6 +6765,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
-msgid "OSM username (email)"
-msgstr "Username OSM (email)"
+msgid "OSM username (e-mail)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
@@ -6486,10 +6775,7 @@
 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 ""
-"<html>ATTENZIONE: la password è memorizzata in chiaro nel file delle "
-"preferenze.<br>La password è trasferita al server in chiaro, codificata "
-"nell'URL<br><b>Non usare una password importante.</b></html>"
 
 #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on
@@ -6812,6 +7098,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 "Collegamento al server OSM in corso..."
@@ -6822,7 +7109,7 @@
 msgstr "Scaricamento dei punti da {0} a {1} in corso..."
 
-#: ../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 "Scaricamento dei dati OSM in corso..."
@@ -6888,15 +7175,14 @@
 msgstr "Importazione NMEA non riuscita!"
 
-#: ../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 "Questa versione di JOSM non è compatibile con il configurato."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:207
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172
 #, java-format
 msgid ""
@@ -6907,5 +7193,5 @@
 "supportare le versione da {0} a {1}."
 
-#: ../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}"
@@ -6914,27 +7200,33 @@
 "protocollo"
 
-#: ../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 "Impossibile leggere valori numerici dalla risposta"
-
-#: ../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 "Apertura del gruppo di modifiche..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:351
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298
 msgid "Closing changeset..."
 msgstr "Chiusura del gruppo di modifiche..."
 
-#: ../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 ""
 "Non è presente alcun gruppo di modifiche per il caricamento differenziale"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:376
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:321
 msgid "Preparing..."
 msgstr "Preparazione in corso..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:381
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:326
 msgid "Uploading..."
 msgstr "Invio in corso..."
@@ -6949,25 +7241,25 @@
 msgstr "File bz2 non valido."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:80
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:73
 msgid "Incorrect password or username."
 msgstr "Nome utente o password errati."
 
-#: ../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 "Attenzione: la password è trasferita non cifrata."
 
-#: ../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 "Salva nome utente e password (non cifrata)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:89
 msgid "Enter Password"
 msgstr "Inserire la password"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
 msgid "Login"
 msgstr "Login"
 
-#: ../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..."
@@ -6978,4 +7270,47 @@
 msgstr "File compressi gzip del server OSM"
 
+#: ../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."
@@ -7074,9 +7409,23 @@
 msgstr "Id del nodo malformato"
 
-#: ../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 "Connessione al server in corso..."
 
-#: ../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."
@@ -7085,17 +7434,9 @@
 "internet."
 
-#: ../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 ""
-"Il server ha restituito un errore interno. Prova con un'area piccola o "
-"aspetta prima di riprovare."
-
-#: ../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 ""
 
@@ -7111,5 +7452,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 "Scarica Estensioni"
@@ -7305,9 +7646,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 "Scarica le estensioni mancanti"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:128
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:119
 #, java-format
 msgid ""
@@ -7320,6 +7661,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
@@ -7342,35 +7683,35 @@
 msgstr "sconosciuto"
 
-#: ../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}: Versione {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 "Estensioni fornite con JOSM"
 
-#: ../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 "Impossibile leggere il file con le informazioni sulle estensioni: {0}"
 
-#: ../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 "Questo si trova dopo la fine della registrazione"
 
-#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:329
+#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:340
 msgid "Error playing sound"
 msgstr "Impossibile riprodurre il suono"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
 msgid "Do nothing"
 msgstr "Non fare niente"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
 msgid "Report Bug"
 msgstr "Segnala bug"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:52
 msgid ""
 "An unexpected exception occurred.\n"
@@ -7385,14 +7726,14 @@
 "inoltrare un bug report."
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55
 msgid "Unexpected Exception"
 msgstr "Eccezione inattesa"
 
-#: ../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 "Si prega di segnalare il problema a {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 ""
@@ -7400,5 +7741,5 @@
 "possibile)!"
 
-#: ../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 "
@@ -7408,9 +7749,9 @@
 "di segnalare un problema."
 
-#: ../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 "Assicurarsi di includere le seguenti informazioni:"
 
-#: ../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 "(Il testo è stato già copiato nei tuoi appunti)"
@@ -7498,5 +7839,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 "Descrizione"
@@ -7879,9 +8220,7 @@
 #: ../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 ""
-"Un errore è stato rilevato durante il tentativo di correlare le foto al "
-"tracciato GPX. E' possibile far corrispondere le foto in modo manuale."
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:853
@@ -7913,5 +8252,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"
@@ -7934,5 +8272,5 @@
 msgstr "File cache della zona 4 di Lambert (.4)"
 
-#: ../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
@@ -7992,12 +8330,16 @@
 "Would you like to restore F11 for grab action ?"
 msgstr ""
+"L'estensione cadastre-fr usata tradizionalmente per gestire la scorciatoia "
+"da tastiera F11\n"
+"che è attualmente riservata per la modalità a tutto schermo\n"
+"Si desidera ripristinare F11 per l'azione di cattura ?"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
 msgid "Restore grab shortcut F11"
-msgstr ""
+msgstr "Ripristino della scorciatoia F11 di cattura"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:213
 msgid "JOSM is stopped for the change to take effect."
-msgstr ""
+msgstr "JOSM si è fermato in attesa che il cambiamento abbia effetto."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:28
@@ -8027,6 +8369,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/"
@@ -8119,6 +8461,6 @@
 msgstr "Aggiungere \"source=...\" agli elementi?"
 
-#: ../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
@@ -8126,11 +8468,11 @@
 msgstr "Scaricamento di {0}"
 
-#: ../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 "Collegamento al Server WMS in corso..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:157
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:158
 msgid "Create buildings"
 msgstr "Crea un edificio"
@@ -8149,13 +8491,13 @@
 msgstr "Abilitare la sorgente automatica e controllare l'annata del catasto."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:61
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:62
 msgid "Extract SVG ViewBox..."
 msgstr "Estrai il riquadro di visualizzazione SVG..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:65
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:66
 msgid "Extract best fitting boundary..."
 msgstr "Estrai il riquadro più appropriato..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:126
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:127
 msgid "Create boundary"
 msgstr "Creazione confine"
@@ -8176,5 +8518,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 "Scarica immagine dal WMS francese del catasto"
 
@@ -8256,5 +8598,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:35
 msgid "Adjust the position of the WMS layer (raster images only)"
-msgstr ""
+msgstr "Regola la posizione del livello WMS (solo immagini non vettoriali)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSDownloadAction.java:19
@@ -8272,5 +8614,5 @@
 "Selezionare prima uno di questi, e poi riprovare"
 
-#: ../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
@@ -8278,59 +8620,28 @@
 msgstr "Livello vuoto"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:176
 #, java-format
 msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr "Layer WMS ({0}), {1} tile scaricate"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:183
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:178
 msgid "Is not vectorized."
 msgstr "Non è vettorializzato"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:179
 #, java-format
 msgid "Raster center: {0}"
 msgstr "Centro del easter: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181
 msgid "Is vectorized."
 msgstr "E' stato vettorializzato"
 
-#: ../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 "Riquadro del comune: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:282
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
-msgid "Save WMS layer to file"
-msgstr "Salva il livello WMS su file"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:287
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:295
-msgid "Save WMS layer"
-msgstr "Salva livello WMS"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:309
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
-msgid "Load WMS layer from file"
-msgstr "Carica il livello WMS da file"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:314
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:323
-msgid "Load WMS layer"
-msgstr "Carica livello WMS"
-
-#: ../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 "Versione del file WMS non supportata; trovata {0}, attesa {1}"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:325
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:335
-msgid "File Format Error"
-msgstr "Errore nel formato del file"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:481
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:401
 #, java-format
 msgid ""
@@ -8341,16 +8652,14 @@
 "Crearne uno nuovo."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:482
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402
 msgid "Cache Format Error"
 msgstr "Errore nel formato della cache"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:497
-#, java-format
-msgid "Lambert zone {0} in cache  incompatible with current Lambert zone {1}"
-msgstr ""
-"La zona di Lambert {0} nella cache è incompatibile con la zona di Lambert "
-"corrente {1}"
-
-#: ../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 "Errore nella zona di Lambert della cache"
@@ -8448,11 +8757,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 "Importa percorso da un livello GPX"
 
 #: ../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 "Elimina percorso esistente"
@@ -8462,5 +8771,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 "Non è stato trovato alcun livello dei dati GPX."
@@ -8751,4 +9060,8 @@
 msgid "Lakewalker trace"
 msgstr "Traccia Lakewalker"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:10
+msgid "An unknown error has occurred"
+msgstr ""
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
@@ -9076,18 +9389,18 @@
 msgstr "LiveGPS"
 
-#: ../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 "Valori misurati"
 
-#: ../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 "Apri la finestra delle misurazioni"
 
-#: ../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 "Azzera"
 
-#: ../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 ""
@@ -9095,25 +9408,25 @@
 "misurazione."
 
-#: ../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 "Lunghezza del percorso"
 
-#: ../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 "Lunghezza della selezione"
 
-#: ../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 "Area della selezione"
 
-#: ../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 "Angolo"
 
-#: ../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 "Angolo compreso tra due nodi selezionati"
 
-#: ../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 "Livello in cui fare le misurazioni"
@@ -9175,6 +9488,6 @@
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
-msgid "Open the OpenStreetBugs window and activate the automatic download"
-msgstr "Apri la finestra di OpenStreetBugs e attiva lo scaricamento automatico"
+msgid "Opens the OpenStreetBugs window and activates the automatic download"
+msgstr ""
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:123
@@ -9253,5 +9566,5 @@
 msgstr "Osmarender"
 
-#: ../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 "
@@ -9261,9 +9574,9 @@
 "delle impostazioni della mappa nelle preferenze."
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:123
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:127
 msgid "osmarender options"
 msgstr "Opzioni osmarender"
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:124
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:128
 msgid "Firefox executable"
 msgstr "Eseguibile di Firefox"
@@ -9704,5 +10017,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 "Nome Strada"
@@ -9797,6 +10110,6 @@
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:195
-msgid "No intersections found. Nothing was changed."
-msgstr "non è stata trovata nessuna intersezione. Nulla è stato cambiato."
+msgid "No intersection found. Nothing was changed."
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:217
@@ -10703,43 +11016,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 ""
-"Si può aggiungere editare o cancellare le voci WMS nella scheda delle "
-"preferenze di WMSplugin - queste saranno poi visualizzate nel menu WMS.\n"
-"\n"
-"La stessa cosa può essere fatta anche manualmente nelle preferenze avanzate, "
-"usando il seguente schema:\n"
-"wmsplugin.url.1.name=Landsat\n"
-"wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n"
-"wmsplugin.url.2.name=NPE Maps... etc\n"
-"\n"
-"Esempio di formato URL di input WMS completo (landsat)\n"
-"http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n"
-"layers=global_mosaic&styles=&srs=EPSG:4326&\n"
-"format=image/jpeg \n"
-"\n"
-"Per il rettificatore di mappe Metacarta http://labs.metacarta.com/"
-"rectifier/ , è sufficiente inserire l'identificativo pertinente.\n"
-"Per aggiungere una voce al menù relativo al rettificatore di mappe "
-"Metacarta, creare manualmente l'URL come in questo esempio, sostituendo 73 "
-"con l'identificativo della propria immagine: \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"
-"Nota: assicurarsi che l'immagine sia adatta ed in regola con i diritti "
-"d'autore. Se si è in dubbio non usarla."
-
-#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:54
+
+#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:53
 msgid "WMS Plugin Help"
 msgstr "Aiuto sull'estensione WMS"
@@ -10752,10 +11040,10 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:68
 msgid "Download Rectified Images From Various Services"
-msgstr ""
+msgstr "Scarica immagini rettificate da vari servizi"
 
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70
 #, java-format
 msgid "WMS: {0}"
-msgstr ""
+msgstr "WMS: {0}"
 
 #. This service serves the purpose of "just this once" without forcing the user
@@ -10765,22 +11053,22 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:106
 msgid "Custom WMS Link"
-msgstr ""
+msgstr "Collegamento WMS personalizzato"
 
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:111
 msgid "Supported Rectifier Services:"
-msgstr ""
+msgstr "Servizi di rettifica supportati:"
 
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:135
 msgid "Visit Homepage"
-msgstr ""
+msgstr "Visita la homepage"
 
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:144
 msgid "WMS URL or Image ID:"
-msgstr ""
+msgstr "Indirizzo URL WMS o ID dell'immagine:"
 
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:148
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
 msgid "Add Rectified Image"
-msgstr ""
+msgstr "Aggiungi immagine rettificata"
 
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:198
@@ -10789,8 +11077,10 @@
 "again."
 msgstr ""
+"Non è possibile far corrispondere il collegamento inserito o "
+"l'identificativo al servizio selezionato. Si prega di riprovare."
 
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199
 msgid "No valid WMS URL or id"
-msgstr ""
+msgstr "Nessun id o indirizzo URL WMS valido"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:28
@@ -10798,5 +11088,5 @@
 msgstr "Correggere la posizione del layer WMS selezionato"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113
 #, java-format
 msgid ""
@@ -10844,4 +11134,29 @@
 msgid "Alpha channel"
 msgstr "Alpha channel"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
+msgid "Save WMS layer to file"
+msgstr "Salva il livello WMS su file"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:295
+msgid "Save WMS layer"
+msgstr "Salva livello WMS"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
+msgid "Load WMS layer from file"
+msgstr "Carica il livello WMS da file"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:323
+msgid "Load WMS layer"
+msgstr "Carica livello WMS"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:334
+#, java-format
+msgid "Unsupported WMS file version; found {0}, expected {1}"
+msgstr "Versione del file WMS non supportata; trovata {0}, attesa {1}"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:335
+msgid "File Format Error"
+msgstr "Errore nel formato del file"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:163
@@ -10937,4 +11252,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 ""
@@ -10953,5 +11273,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 ""
 "Un particolare gestore per il server WMS del registro territoriale francese."
@@ -11287,5 +11607,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 "Riferimento"
@@ -11787,5 +12107,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 "Larghezza (metri)"
@@ -12254,7 +12574,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 "Tipo"
@@ -12870,10 +13190,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 "Operatore"
@@ -13085,7 +13405,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 "Elevazione"
@@ -14017,5 +14337,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 "Tariffa"
@@ -14151,5 +14471,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 "Riferimento (numero del tracciato)"
@@ -14157,5 +14477,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 "Area"
@@ -14207,11 +14527,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 "Pensilina/ricovero"
+
+#. item "Public Transport/Bus Stop" check "Shelter"
 #. </optional>
-#: build/trans_presets.java:1503
+#: build/trans_presets.java:1504
 msgid "Bus Platform"
 msgstr "Piattaforma fermata bus"
 
 #. item
-#: build/trans_presets.java:1504
+#: build/trans_presets.java:1505
 msgid "Edit Bus Platform"
 msgstr "Modifica una piattaforma degli autobus"
@@ -14219,5 +14549,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1512
+#: build/trans_presets.java:1513
 msgid "Taxi"
 msgstr "Taxi"
@@ -14225,5 +14555,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 "Stazione dei taxi"
@@ -14231,5 +14561,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1519
+#: build/trans_presets.java:1520
 msgid "Airport"
 msgstr "Aeroporto"
@@ -14237,15 +14567,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 "Modifica aeroporto"
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1526
+#: build/trans_presets.java:1527
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1527
+#: build/trans_presets.java:1528
 msgid "ICAO"
 msgstr "ICAO"
@@ -14254,5 +14584,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1532
+#: build/trans_presets.java:1533
 msgid "Accomodation"
 msgstr "Alloggiamento"
@@ -14264,5 +14594,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 "Hotel"
@@ -14271,15 +14601,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 "Modifica hotel"
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1539
+#: build/trans_presets.java:1540
 msgid "Stars"
 msgstr "Stelle"
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1541
+#: build/trans_presets.java:1542
 msgid "Motel"
 msgstr "Motel"
@@ -14287,20 +14617,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 "Modifica Motel"
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1547
+#: build/trans_presets.java:1548
 msgid "Guest House"
 msgstr "Guest House"
 
 #. item
-#: build/trans_presets.java:1548
+#: build/trans_presets.java:1549
 msgid "Edit Guest House"
 msgstr "Modifica Guest House"
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1552
+#: build/trans_presets.java:1553
 msgid "Chalet"
 msgstr "Casetta (chalet)"
@@ -14308,10 +14638,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 "Modifica casetta (chalet)"
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1558
+#: build/trans_presets.java:1559
 msgid "Hostel"
 msgstr "Ostello"
@@ -14319,30 +14649,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 "Modifica ostello"
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1564
+#: build/trans_presets.java:1565
 msgid "Alpine Hut"
 msgstr "Rifugio alpino"
 
 #. item
-#: build/trans_presets.java:1565
+#: build/trans_presets.java:1566
 msgid "Edit Alpine Hut"
 msgstr "Modifica rifugio alpino"
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1570
+#: build/trans_presets.java:1571
 msgid "Caravan Site"
 msgstr "Area caravan e camper"
 
 #. item
-#: build/trans_presets.java:1571
+#: build/trans_presets.java:1572
 msgid "Edit Caravan Site"
 msgstr "Modifica area caravan e camper"
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1575
+#: build/trans_presets.java:1576
 msgid "Camping Site"
 msgstr "Campeggio"
@@ -14350,10 +14680,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 "Modifica campeggio"
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1582
+#: build/trans_presets.java:1583
 msgid "Food+Drinks"
 msgstr "Cibo+bevande"
@@ -14364,5 +14694,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 "Ristorante"
@@ -14370,5 +14700,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 "Modifica ristorante"
@@ -14376,5 +14706,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 "Cucina"
@@ -14382,61 +14712,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 "italiana"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "chinese"
 msgstr "cinese"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "burger"
 msgstr "hamburger"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "greek"
 msgstr "greca"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "german"
 msgstr "tedesca"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "indian"
 msgstr "indiana"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "regional"
-msgstr "reginale"
-
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+msgstr "regionale"
+
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "turkish"
 msgstr "turca"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "asian"
 msgstr "asiatica"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "thai"
 msgstr "tailandese"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "mexican"
 msgstr "messicana"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "japanese"
 msgstr "giapponese"
 
-#: build/trans_presets.java:1590
+#: build/trans_presets.java:1591
 msgid "Fast Food"
 msgstr "Fast food"
@@ -14444,9 +14774,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 "Modifica fast food"
 
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1598
 msgid "Cafe"
 msgstr "Caffetteria"
@@ -14454,10 +14784,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 "Caffetteria"
 
 #. item "Food+Drinks/Cafe" text "Name"
-#: build/trans_presets.java:1603
+#: build/trans_presets.java:1604
 msgid "Pub"
 msgstr "Pub"
@@ -14465,20 +14795,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 "Modifica Pub"
 
 #. item "Food+Drinks/Pub" text "Name"
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1610
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item
-#: build/trans_presets.java:1610
+#: build/trans_presets.java:1611
 msgid "Edit Biergarten"
 msgstr "Modifica Biergarten"
 
 #. item "Food+Drinks/Biergarten" text "Name"
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1615
 msgid "Bar"
 msgstr "Bar"
@@ -14486,10 +14816,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 "Modifica Bar"
 
 #. item "Food+Drinks/Bar" text "Name"
-#: build/trans_presets.java:1620
+#: build/trans_presets.java:1621
 msgid "Nightclub"
 msgstr "Club notturno"
@@ -14497,20 +14827,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 "Modifica club notturno"
 
 #. item "Food+Drinks/Nightclub" text "Name"
-#: build/trans_presets.java:1627
+#: build/trans_presets.java:1628
 msgid "Tourism"
 msgstr "Turismo"
 
 #. group "Tourism"
-#: build/trans_presets.java:1628
+#: build/trans_presets.java:1629
 msgid "Attraction"
 msgstr "Attrazione turistica"
 
 #. item
-#: build/trans_presets.java:1629
+#: build/trans_presets.java:1630
 msgid "Edit Attraction"
 msgstr "Modifica attrazione turistica"
@@ -14519,11 +14849,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 "Orario di apertura"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1634
+#: build/trans_presets.java:1635
 msgid "Museum"
 msgstr "Museo"
@@ -14531,10 +14861,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 "Modifica museo"
 
 #. item "Tourism/Museum" text "Name"
-#: build/trans_presets.java:1640
+#: build/trans_presets.java:1641
 msgid "Zoo"
 msgstr "Zoo"
@@ -14543,10 +14873,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 "Modifica zoo"
 
 #. item "Tourism/Zoo" text "Name"
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1648
 msgid "Viewpoint"
 msgstr "Punto panoramico"
@@ -14554,25 +14884,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 "Modifica punto panoramico"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1652
+#: build/trans_presets.java:1653
 msgid "Look-Out Tower"
 msgstr "Torre di avvistamento"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1654
+#: build/trans_presets.java:1655
 msgid "Theme Park"
 msgstr "Parco divertimenti"
 
 #. item
-#: build/trans_presets.java:1655
+#: build/trans_presets.java:1656
 msgid "Edit Theme Park"
 msgstr "Modifica parco divertimenti"
 
 #. item "Tourism/Theme Park" text "Name"
-#: build/trans_presets.java:1659
+#: build/trans_presets.java:1660
 msgid "Artwork"
 msgstr "Opera d'arte"
@@ -14580,5 +14910,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 "Modifica opera d'arte"
@@ -14586,5 +14916,5 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1667
 msgid "Information Office"
 msgstr "Ufficio informazioni"
@@ -14592,83 +14922,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 "Modifica ufficio informazioni"
 
+#. item "Tourism/Information Office" text "Opening Hours"
+#: build/trans_presets.java:1675
+msgid "Map"
+msgstr "Mappa"
+
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1679
 msgid "Map Type"
 msgstr "Tipo di mappa"
 
 #. item "Tourism/Map" combo "Map Type"
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1679
 msgid "map"
 msgstr "mappa"
 
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1679
 msgid "citymap"
 msgstr "mappa cittadina"
 
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1679
 msgid "hikingmap"
 msgstr "mappa escursionistica"
 
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1679
 msgid "bicyclemap"
 msgstr "mappa ciclistica"
 
 #. 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 "Descrizione più specifica"
 
 #. item "Tourism/Map" text "Closer Description"
-#: build/trans_presets.java:1681
+#: build/trans_presets.java:1682
 msgid "Information Board"
 msgstr "Tabellone informativo"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1686
 msgid "Board Type"
 msgstr "Tipo di tabellone"
 
 #. item "Tourism/Information Board" combo "Board Type"
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1686
 msgid "board"
 msgstr "tavola"
 
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1686
 msgid "history"
 msgstr "storia"
 
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1686
 msgid "nature"
 msgstr "natura"
 
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1686
 msgid "wildlife"
 msgstr "fauna"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1688
+#: build/trans_presets.java:1689
 msgid "Guidepost (Hiking)"
 msgstr "Cartello di indicazioni (escursionismo)"
 
 #. item "Tourism/Guidepost (Hiking)" text "Elevation"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1696
 msgid "Other Information Points"
 msgstr "Altri punti informativi"
 
-#. 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 "Pensilina/ricovero"
-
-#. item
-#: build/trans_presets.java:1703
+#. item
+#: build/trans_presets.java:1704
 msgid "Edit Shelter"
 msgstr "Modifica pensilina/ricovero"
@@ -14676,25 +15003,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 "Caminetto"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1709
 msgid "Picnic Site"
 msgstr "Area picnic"
 
 #. item
-#: build/trans_presets.java:1709
+#: build/trans_presets.java:1710
 msgid "Edit Picnic Site"
 msgstr "Modifica area picnic"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1716
 msgid "Historic Places"
 msgstr "Luoghi storici"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1716
+#: build/trans_presets.java:1717
 msgid "Castle"
 msgstr "Castello"
@@ -14703,20 +15030,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 "Modifica castello"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1724
 msgid "Ruins"
 msgstr "Rovine"
 
 #. item
-#: build/trans_presets.java:1724
+#: build/trans_presets.java:1725
 msgid "Edit Ruins"
 msgstr "Modifica rovine"
 
 #. item "Historic Places/Ruins" text "Name"
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1729
 msgid "Archaeological Site"
 msgstr "Sito archeologico"
@@ -14725,10 +15052,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 "Modifica sito archeologico"
 
 #. item "Historic Places/Archaeological Site" text "Name"
-#: build/trans_presets.java:1735
+#: build/trans_presets.java:1736
 msgid "Battlefield"
 msgstr "Campo di battaglia"
@@ -14736,5 +15063,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 "Modifica campo di battaglia"
@@ -14742,15 +15069,15 @@
 #. item "Historic Places/Battlefield" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1743
 msgid "Monument"
 msgstr "Monumento"
 
 #. item
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1744
 msgid "Edit Monument"
 msgstr "Modifica monumento"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1748
 msgid "Memorial"
 msgstr "Memoriale"
@@ -14758,45 +15085,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 "Modifica memoriale"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1753
+#: build/trans_presets.java:1754
 msgid "Wayside Cross"
-msgstr "Wayside Cross"
-
-#. item
-#: build/trans_presets.java:1754
+msgstr "Crocefisso"
+
+#. item
+#: build/trans_presets.java:1755
 msgid "Edit Wayside Cross"
-msgstr "Modifica Wayside Cross"
+msgstr "Crocefisso"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1758
+#: build/trans_presets.java:1759
 msgid "Wayside Shrine"
 msgstr "Edicola votiva"
 
 #. item
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1760
 msgid "Edit Wayside Shrine"
 msgstr "Modifica edicola votiva"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1765
 msgid "Leisure"
 msgstr "Svago"
 
 #. group "Leisure"
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1766
 msgid "Water Park"
 msgstr "Parco acquatico"
 
 #. item
-#: build/trans_presets.java:1766
+#: build/trans_presets.java:1767
 msgid "Edit Water Park"
 msgstr "Modifica parco acquatico"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1770
+#: build/trans_presets.java:1771
 msgid "Playground"
 msgstr "Parco giochi"
@@ -14804,15 +15131,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 "Modifica parco giochi"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1776
+#: build/trans_presets.java:1777
 msgid "Fishing"
 msgstr "Riserva di pesca"
 
 #. item
-#: build/trans_presets.java:1777
+#: build/trans_presets.java:1778
 msgid "Edit Fishing"
 msgstr "Modifica riserva di pesca"
@@ -14820,15 +15147,15 @@
 #. item "Leisure/Fishing" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1783
+#: build/trans_presets.java:1784
 msgid "Sport Facilities"
 msgstr "Strutture sportive"
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1784
+#: build/trans_presets.java:1785
 msgid "Stadium"
 msgstr "Stadio"
 
 #. item
-#: build/trans_presets.java:1785
+#: build/trans_presets.java:1786
 msgid "Edit Stadium"
 msgstr "Modifica stadio"
@@ -14842,6 +15169,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 "seleziona uno sport:"
@@ -15217,6 +15544,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
@@ -15249,227 +15576,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 "polivalente"
 
-#: 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 "tiro con l'arco"
 
-#: 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 "atletica"
 
-#: 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 "football_australiano"
 
-#: 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 "baseball"
 
-#: 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 "pallacanestro"
 
-#: 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 "boules"
 
-#: 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 "boccie"
 
-#: 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 "canoa"
 
-#: 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 "arrampicata"
 
-#: 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 "cricket"
 
-#: 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 "reti_cricket"
 
-#: 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 "croquet"
 
-#: 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 "ciclismo"
 
-#: 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 "cinodromo"
 
-#: 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 "sport_equestri"
 
-#: 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 "football_americano"
 
-#: 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 "golf"
 
-#: 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 "ginnastica"
 
-#: 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 "hockey"
 
-#: 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 "ippodromo"
 
-#: 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 "autodromo"
 
-#: 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 "pelota"
 
-#: 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 "racchette"
 
-#: 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 "rugby"
 
-#: 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 "poligono_di_tiro"
 
-#: 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 "skateboard"
 
-#: 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 "pattinaggio"
 
-#: 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 "comprensorio_sciistico"
 
-#: 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 "calcio"
 
-#: 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 "piscina"
 
-#: 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 "ping_pong"
 
-#: 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 "tennis"
 
-#: build/trans_presets.java:1793
+#: build/trans_presets.java:1794
 msgid "Sports Centre"
 msgstr "Centro sportivo"
 
 #. item
-#: build/trans_presets.java:1794
+#: build/trans_presets.java:1795
 msgid "Edit Sports Centre"
 msgstr "Modifica centro sportivo"
 
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1803
 msgid "Pitch"
 msgstr "Campo sportivo"
 
 #. item
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1804
 msgid "Edit Pitch"
 msgstr "Modifica campo sportivo"
 
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1812
 msgid "Racetrack"
 msgstr "Circuito (pista)"
 
 #. item
-#: build/trans_presets.java:1812
+#: build/trans_presets.java:1813
 msgid "Edit Racetrack"
 msgstr "Modifica circuito (pista)"
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1821
 msgid "Golf Course"
 msgstr "Campo da golf"
 
 #. item
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1822
 msgid "Edit Golf Course"
 msgstr "Modifica campo da golf"
 
 #. item "Sport Facilities/Golf Course" text "Name"
-#: build/trans_presets.java:1825
+#: build/trans_presets.java:1826
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item
-#: build/trans_presets.java:1826
+#: build/trans_presets.java:1827
 msgid "Edit Miniature Golf"
 msgstr "Modifica minigolf"
 
 #. item "Sport Facilities/Miniature Golf" text "Name"
-#: build/trans_presets.java:1831
+#: build/trans_presets.java:1832
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1833
 msgid "Multi"
 msgstr "Struttura polivalente"
 
 #. item
-#: build/trans_presets.java:1833
+#: build/trans_presets.java:1834
 msgid "Edit Multi"
 msgstr "Modifica struttura polivalente"
@@ -15508,191 +15835,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 "campo_sportivo"
 
-#: 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 "centro_sportivo"
 
-#: 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 "stadio"
 
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1839
 msgid "10pin"
 msgstr "Bowling"
 
 #. item
-#: build/trans_presets.java:1839
+#: build/trans_presets.java:1840
 msgid "Edit 10pin"
 msgstr "Modifica bowling"
 
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1845
 msgid "Athletics"
 msgstr "Atletica"
 
 #. item
-#: build/trans_presets.java:1845
+#: build/trans_presets.java:1846
 msgid "Edit Athletics"
 msgstr "Modifica atletica"
 
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1851
 msgid "Archery"
 msgstr "Tiro con l'arco"
 
 #. item
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:1852
 msgid "Edit Archery"
 msgstr "Modifica tiro con l'arco"
 
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:1857
 msgid "Climbing"
 msgstr "Arrampicata"
 
 #. item
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:1858
 msgid "Edit Climbing"
 msgstr "Modifica arrampicata"
 
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1863
 msgid "Canoeing"
 msgstr "Canoa"
 
 #. item
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:1864
 msgid "Edit Canoeing"
 msgstr "Modifca canoa"
 
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:1869
 msgid "Cycling"
 msgstr "Ciclismo"
 
 #. item
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1870
 msgid "Edit Cycling"
 msgstr "Modifica ciclismo"
 
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1875
 msgid "Dog Racing"
 msgstr "Corse dei cani"
 
 #. item
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1876
 msgid "Edit Dog Racing"
 msgstr "Modifica corse dei cani"
 
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1881
 msgid "Equestrian"
 msgstr "Equitazione"
 
 #. item
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:1882
 msgid "Edit Equestrian"
 msgstr "Modificare Equitazione"
 
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1887
 msgid "Horse Racing"
 msgstr "Ippodromo"
 
 #. item
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1888
 msgid "Edit Horse Racing"
 msgstr "Modifica ippodromo"
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:1893
 msgid "Gymnastics"
 msgstr "Ginnastica"
 
 #. item
-#: build/trans_presets.java:1893
+#: build/trans_presets.java:1894
 msgid "Edit Gymnastics"
 msgstr "Modificare Ginnastica"
 
-#: build/trans_presets.java:1898
+#: build/trans_presets.java:1899
 msgid "Motor Sports"
 msgstr "Sport motoristici"
 
 #. item
-#: build/trans_presets.java:1899
+#: build/trans_presets.java:1900
 msgid "Edit Motor Sports"
 msgstr "Modifica Sport Motoristici"
 
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:1905
 msgid "Skating"
 msgstr "Pattinaggio"
 
 #. item
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:1906
 msgid "Edit Skating"
 msgstr "Modificare Pattinaggio"
 
-#: build/trans_presets.java:1910
+#: build/trans_presets.java:1911
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:1912
 msgid "Edit Skateboard"
 msgstr "Modificare Skateboard"
 
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:1917
 msgid "Swimming"
 msgstr "Piscina"
 
 #. item
-#: build/trans_presets.java:1917
+#: build/trans_presets.java:1918
 msgid "Edit Swimming"
 msgstr "Modificare Nuoto"
 
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:1923
 msgid "Skiing"
 msgstr "Sci"
@@ -15700,56 +16027,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 "Modificare Sci"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1928
 msgid "Piste type"
 msgstr "Tipo di pista"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1928
 msgid "downhill"
 msgstr "Sci alpino"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1928
 msgid "nordic"
 msgstr "Sci nordico"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1928
 msgid "snow_park"
 msgstr "snow_park"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:1929
 msgid "Difficulty"
 msgstr "Difficoltà"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:1929
 msgid "novice"
 msgstr "principante"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:1929
 msgid "easy"
 msgstr "facile"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:1929
 msgid "intermediate"
 msgstr "intermedio"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:1929
 msgid "advanced"
 msgstr "avanzato"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:1929
 msgid "expert"
 msgstr "esperto"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:1929
 msgid "freeride"
 msgstr "freeride"
 
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1932
 msgid "Shooting"
 msgstr "Poligono di tiro"
@@ -15757,178 +16084,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 "Modifica poligono di tiro"
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1940
 msgid "Sport (Ball)"
 msgstr "Sport (Pallone)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1941
 msgid "Soccer"
 msgstr "Calcio"
 
 #. item
-#: build/trans_presets.java:1941
+#: build/trans_presets.java:1942
 msgid "Edit Soccer"
 msgstr "Modifica Calcio"
 
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:1947
 msgid "Football"
 msgstr "Football"
 
 #. item
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:1948
 msgid "Edit Football"
 msgstr "Modifica football"
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1953
 msgid "Australian Football"
 msgstr "Football australiano"
 
 #. item
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:1954
 msgid "Edit Australian Football"
 msgstr "Modifica football australiano"
 
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:1959
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:1960
 msgid "Edit Baseball"
 msgstr "Modifica Baseball"
 
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:1965
 msgid "Basketball"
 msgstr "Pallacanestro"
 
 #. item
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:1966
 msgid "Edit Basketball"
 msgstr "Modifica Pallacanestro"
 
-#: 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 "Modifica Golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1975
 msgid "golf_course"
 msgstr "campo_da_golf"
 
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:1977
 msgid "Boule"
 msgstr "Boule (sport popolare in Francia)"
 
 #. item
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:1978
 msgid "Edit Boule"
 msgstr "Modifica boule (sport popolare in Francia)"
 
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:1983
 msgid "Bowls"
 msgstr "Bocce"
 
 #. item
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1984
 msgid "Edit Bowls"
 msgstr "Modifica Bocce"
 
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:1989
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:1990
 msgid "Edit Cricket"
 msgstr "Modifica Cricket"
 
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:1995
 msgid "Cricket Nets"
 msgstr "Reti per Cricket"
 
 #. item
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:1996
 msgid "Edit Cricket Nets"
 msgstr "Modifica Reti per Cricket"
 
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:2001
 msgid "Croquet"
 msgstr "Croquet"
 
 #. item
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:2002
 msgid "Edit Croquet"
 msgstr "Modifica croquet"
 
-#: build/trans_presets.java:2006
+#: build/trans_presets.java:2007
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item
-#: build/trans_presets.java:2007
+#: build/trans_presets.java:2008
 msgid "Edit Hockey"
 msgstr "Modifica Hockey"
 
-#: build/trans_presets.java:2012
+#: build/trans_presets.java:2013
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2014
 msgid "Edit Pelota"
 msgstr "Modifica Pelota"
 
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2019
 msgid "Racquet"
 msgstr "Racquet"
 
 #. item
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2020
 msgid "Edit Racquet"
 msgstr "Modifica racquet"
 
-#: build/trans_presets.java:2024
+#: build/trans_presets.java:2025
 msgid "Rugby"
 msgstr "Rugby"
 
 #. item
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2026
 msgid "Edit Rugby"
 msgstr "Modifica Rugby"
 
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:2031
 msgid "Table Tennis"
 msgstr "Tennis da tavolo"
 
 #. item
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2032
 msgid "Edit Table Tennis"
 msgstr "Modifica Tenniis da tavolo"
 
-#: 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 "Modifica Tennis"
 
 #. <separator/>
-#: build/trans_presets.java:2044
+#: build/trans_presets.java:2045
 msgid "Buildings"
 msgstr "Edifici"
 
 #. group "Buildings"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2046
 msgid "Building"
 msgstr "Palazzo"
@@ -15936,5 +16263,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2049
 msgid "Public Building"
 msgstr "Edificio pubblico"
@@ -15942,10 +16269,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 "Modifica edificio pubblico"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2055
 msgid "Town hall"
 msgstr "Municipio"
@@ -15953,10 +16280,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 "Modifica Municipio"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2061
 msgid "Embassy"
 msgstr "Ambasciata"
@@ -15964,10 +16291,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 "Modifica ambasciata"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2066
+#: build/trans_presets.java:2067
 msgid "Courthouse"
 msgstr "Tribunale"
@@ -15976,10 +16303,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 "Modifica Palazzio del tribunale"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2074
 msgid "Prison"
 msgstr "Prigione"
@@ -15988,10 +16315,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 "Modifica Prigione"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2080
+#: build/trans_presets.java:2081
 msgid "Police"
 msgstr "Polizia"
@@ -16001,10 +16328,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 "Modifica Polizia"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2089
 msgid "Fire Station"
 msgstr "Vigili del fuoco"
@@ -16013,10 +16340,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 "Modifica vigili del fuoco"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2096
 msgid "Post Office"
 msgstr "Ufficio Postale"
@@ -16024,5 +16351,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 "Modifica Ufficio Postale"
@@ -16030,15 +16357,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2103
 msgid "Kindergarten"
 msgstr "Asilo"
 
 #. item
-#: build/trans_presets.java:2103
+#: build/trans_presets.java:2104
 msgid "Edit Kindergarten"
 msgstr "Modifica Asilo"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2108
 msgid "School"
 msgstr "Scuola"
@@ -16046,10 +16373,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 "Modifica Scuola"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2114
 msgid "University"
 msgstr "Università"
@@ -16057,10 +16384,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 "Modifica Università"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2120
 msgid "College"
 msgstr "Scuola superiore"
@@ -16068,5 +16395,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 "Modifica Scuola superiore"
@@ -16074,5 +16401,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2126
+#: build/trans_presets.java:2127
 msgid "Cinema"
 msgstr "Cinema"
@@ -16081,10 +16408,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 "Modifica Cinema"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2133
+#: build/trans_presets.java:2134
 msgid "Library"
 msgstr "Biblioteca"
@@ -16093,10 +16420,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 "Modifica biblioteca"
 
 #. item "Buildings/Library" text "Name"
-#: build/trans_presets.java:2140
+#: build/trans_presets.java:2141
 msgid "Arts Centre"
 msgstr "Centro Artistico"
@@ -16104,10 +16431,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 "Modifica centro d'arte"
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2146
+#: build/trans_presets.java:2147
 msgid "Theatre"
 msgstr "Teatro"
@@ -16116,10 +16443,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 "Modifica Teatro"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2154
 msgid "Place of Worship"
 msgstr "Luogo di culto"
@@ -16129,5 +16456,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 "Modifica Luogo di culto"
@@ -16136,6 +16463,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 "Religione"
@@ -16144,66 +16471,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 "bahaismo"
 
-#: 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 "Buddista"
 
-#: 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 "Cristiana"
 
-#: 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 "induismo"
 
-#: 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 "giainismo"
 
-#: 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 "Ebraica"
 
-#: 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 "Mussulmana"
 
-#: 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 "Spiritualista"
 
-#: 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 "taoismo"
 
-#: 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 "unitariano"
 
-#: 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 "zoroastrismo"
 
-#: 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 "Denominazione"
@@ -16212,81 +16539,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 "Anglicana"
 
-#: 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 "Battista"
 
-#: 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 "Cattolica"
 
-#: 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 "Evangelica"
 
-#: 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 "Testimoni di Geova"
 
-#: 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 "Luterana"
 
-#: 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 "Metodista"
 
-#: 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 "Mormone"
 
-#: 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 "Ortodossa"
 
-#: 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 "Pentecostale"
 
-#: 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 "Prebiteriana"
 
-#: 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 "Protestante"
 
-#: 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 "Quacchera"
 
-#: 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 "sciismo"
 
-#: 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 "sunnismo"
 
 #. <separator/>
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2165
 msgid "Addresses"
 msgstr "Indirizzi"
@@ -16295,5 +16622,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 "Modifica dati indirizzo"
@@ -16301,5 +16628,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2169
+#: build/trans_presets.java:2170
 msgid "House number"
 msgstr "Numero civico"
@@ -16307,20 +16634,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2172
 msgid "House name"
 msgstr "Nome Casa"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2174
 msgid "City name"
 msgstr "Nome città"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2174
+#: build/trans_presets.java:2175
 msgid "Post code"
 msgstr "Codice postale"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2176
 msgid "Country code"
 msgstr "Codice nazione"
@@ -16328,5 +16655,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2179
 msgid "Address Interpolation"
 msgstr "Interpolazione indirizzo"
@@ -16335,5 +16662,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 "Modifica interpolazione indirizzo"
@@ -16341,71 +16668,71 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2184
 msgid "Numbering scheme"
 msgstr "Schema numerazione"
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2184
 msgid "odd"
 msgstr "dispari"
 
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2184
 msgid "even"
 msgstr "pari"
 
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2184
 msgid "all"
 msgstr "tutti"
 
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2184
 msgid "alphabetic"
 msgstr "alfabetico"
 
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2187
 msgid "Man Made"
 msgstr "Costruzioni umane"
 
 #. group "Man Made"
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2188
 msgid "Works"
 msgstr "Fabbrica"
 
 #. item
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2189
 msgid "Edit Works"
 msgstr "Modifica fabbrica"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2193
 msgid "Tower"
 msgstr "Torre"
 
 #. item
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2194
 msgid "Edit Tower"
 msgstr "Modifica torre"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2198
 msgid "Water Tower"
 msgstr "Torre idrica"
 
 #. item
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2199
 msgid "Edit Water Tower"
 msgstr "Modifica torre idrica"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2203
 msgid "Gasometer"
 msgstr "Gasometro"
 
 #. item
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2204
 msgid "Edit Gasometer"
 msgstr "Modifica gasometro"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2207
+#: build/trans_presets.java:2208
 msgid "Lighthouse"
 msgstr "Faro"
@@ -16413,10 +16740,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 "Modifica faro"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2214
 msgid "Windmill"
 msgstr "Mulino a vento"
@@ -16424,10 +16751,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 "Modifica mulino a vento"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2220
 msgid "Pipeline"
 msgstr "Conduttura"
@@ -16435,10 +16762,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 "Modifica conduttura"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2225
+#: build/trans_presets.java:2226
 msgid "Wastewater Plant"
 msgstr "Depuratore acqua"
@@ -16448,10 +16775,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 "Modifica depuratore acqua"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2233
+#: build/trans_presets.java:2234
 msgid "Crane"
 msgstr "Gru permanente"
@@ -16459,10 +16786,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 "Modifica gru permanente"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2239
+#: build/trans_presets.java:2240
 msgid "Beacon"
 msgstr "Torre radio"
@@ -16470,10 +16797,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 "Modifica torre radio"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2245
+#: build/trans_presets.java:2246
 msgid "Survey Point"
 msgstr "Punto geodetico o altra stazione fissa"
@@ -16481,10 +16808,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 "Modifica punto geodetico o altra stazione fissa"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2252
 msgid "Surveillance"
 msgstr "Telecamera di sorveglianza"
@@ -16492,5 +16819,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 "Modifica telecamera di sorveglianza"
@@ -16498,5 +16825,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2258
+#: build/trans_presets.java:2259
 msgid "Power Generator"
 msgstr "Centrale elettrica"
@@ -16506,39 +16833,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 "Modifica centrale elettrica"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "wind"
 msgstr "eolica"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "hydro"
 msgstr "idroelettrica"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "fossil"
 msgstr "a combustibile fossile"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "nuclear"
 msgstr "fissione nucleare"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "coal"
 msgstr "carbone"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "photovoltaic"
 msgstr "fotovoltaico"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "gas"
 msgstr "gas"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2268
 msgid "Power Station"
 msgstr "Stazione elettrica"
@@ -16547,10 +16874,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 "Modifica stazione elettrica"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2274
+#: build/trans_presets.java:2275
 msgid "Power Sub Station"
 msgstr "Sottostazione elettrica"
@@ -16559,5 +16886,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 "Modifica sottostazione elettrica"
@@ -16565,10 +16892,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 "Riferimento linea"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2282
+#: build/trans_presets.java:2283
 msgid "Power Tower"
 msgstr "Pilone (elettricità)"
@@ -16579,5 +16906,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 "Modifica pilone (elettricità)"
@@ -16585,5 +16912,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 "Linea elettrica"
@@ -16592,25 +16919,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 "Modifica linea elettrica"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2298
 msgid "Voltage"
 msgstr "Tensione"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2299
 msgid "Amount of Wires"
 msgstr "Numero di linee"
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2301
+#: build/trans_presets.java:2302
 msgid "Amenities"
 msgstr "Servizi"
 
 #. group "Amenities"
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2303
 msgid "Toilets"
 msgstr "Bagni"
@@ -16618,20 +16945,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 "Numero di riferimento"
 
 #. 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 "Nota"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2312
 msgid "Post Box"
 msgstr "Cassetta Postale"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2317
 msgid "Telephone"
 msgstr "Telefono"
@@ -16640,5 +16967,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 "Modifica Telefono"
@@ -16646,5 +16973,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 "Monete"
@@ -16652,5 +16979,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 "Note"
@@ -16658,5 +16985,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 "Portafogli elettronici e carte di debito"
@@ -16664,5 +16991,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 "Carte di debito"
@@ -16670,15 +16997,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 "Carte di credito"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2328
 msgid "Telephone cards"
 msgstr "Carte telefoniche"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2330
 msgid "Recycling"
 msgstr "Riciclaggio"
@@ -16687,5 +17014,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 "Modifica Stazione di riciclaggio"
@@ -16693,35 +17020,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 "Batterie"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2336
 msgid "Cans"
 msgstr "Lattine"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2337
 msgid "Clothes"
 msgstr "Vestiti"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2338
 msgid "Glass"
 msgstr "Vetro"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2339
 msgid "Paper"
 msgstr "Carta"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2340
 msgid "Scrap Metal"
 msgstr "Rottami metallici"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2342
 msgid "Bench"
 msgstr "Panchina"
@@ -16730,20 +17057,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 "Postazione di caccia"
 
 #. item
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2347
 msgid "Edit Hunting Stand"
 msgstr "Modifica una postazione di caccia"
 
 #. item "Amenities/Hunting Stand" check "Shelter"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2350
 msgid "Hide"
 msgstr "Nascondi"
 
 #. item "Amenities/Hunting Stand" check "Hide"
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2351
 msgid "Lock"
 msgstr "Blocco"
@@ -16751,22 +17078,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 "Modifica Albero"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2351
+#: build/trans_presets.java:2352
 msgid "low"
 msgstr "basso"
 
-#: build/trans_presets.java:2351
+#: build/trans_presets.java:2352
 msgid "half"
 msgstr "mezzo"
 
-#: build/trans_presets.java:2351
+#: build/trans_presets.java:2352
 msgid "full"
 msgstr "completo"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2354
 msgid "Fountain"
 msgstr "Fontana"
@@ -16775,10 +17102,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 "Modifica Fontana"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2361
 msgid "Drinking Water"
 msgstr "Acqua potabile"
@@ -16787,10 +17114,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 "Modifica acqua potabile"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2367
+#: build/trans_presets.java:2368
 msgid "Baby Hatch"
 msgstr "Culla per la vita"
@@ -16798,25 +17125,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 "Modifica culla per la vita"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2375
+#: build/trans_presets.java:2376
 msgid "Shops"
 msgstr "Negozi"
 
 #. group "Shops"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2377
 msgid "Supermarket"
 msgstr "Supermercato"
 
 #. item
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2378
 msgid "Edit Supermarket"
 msgstr "Modifica Supermercato"
 
 #. item "Shops/Supermarket" text "Name"
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:2382
 msgid "Convenience Store"
 msgstr "Minimarket"
@@ -16824,10 +17151,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 "Modifica minimarket"
 
 #. item "Shops/Convenience Store" text "Name"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2388
 msgid "Kiosk"
 msgstr "Chiosco"
@@ -16835,10 +17162,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 "Modificia Chiosco"
 
 #. item "Shops/Kiosk" text "Name"
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2394
 msgid "Vending machine"
 msgstr "Distributore automatico"
@@ -16846,5 +17173,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 "Modifica Distributore automatico"
@@ -16852,88 +17179,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 "Distributore automatico"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "public_transport_tickets"
 msgstr "Biglietti trasporto pubblico"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "public_transport_plans"
 msgstr "Orari trasporto pubblico"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "parking_tickets"
 msgstr "Biglietti per il parcheggio"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "food"
 msgstr "Alimenti"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "drinks"
 msgstr "Bevande"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "sweets"
 msgstr "Dolci"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "cigarettes"
 msgstr "Sigarette"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "photos"
 msgstr "fotografie"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "animal_food"
 msgstr "Cibo per animali"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "news_papers"
 msgstr "Giornali"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "toys"
 msgstr "giocattoli"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "stamps"
 msgstr "francobolli"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "SIM-cards"
 msgstr "Schede SIM"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "telephone_vouchers"
 msgstr "buoni_telefonici"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "vouchers"
 msgstr "buoni"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "condoms"
 msgstr "preservativi"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "tampons"
 msgstr "assorbenti"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "excrement_bags"
 msgstr "Sacchetto per escrementi"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2407
 msgid "Account or loyalty cards"
 msgstr "Conto o carta fedeltà"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2408
+#: build/trans_presets.java:2409
 msgid "Butcher"
 msgstr "Macellaio"
@@ -16941,10 +17268,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 "Modifica Macellaio"
 
 #. item "Shops/Butcher" text "Name"
-#: build/trans_presets.java:2414
+#: build/trans_presets.java:2415
 msgid "Baker"
 msgstr "Panificio"
@@ -16952,10 +17279,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 "Modifica Panificio"
 
 #. item "Shops/Baker" text "Name"
-#: build/trans_presets.java:2420
+#: build/trans_presets.java:2421
 msgid "Florist"
 msgstr "Fiorista"
@@ -16963,20 +17290,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 "Modifica Fiorista"
 
 #. item "Shops/Florist" text "Name"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2427
 msgid "Organic"
 msgstr "Prodotti biologici"
 
 #. item
-#: build/trans_presets.java:2427
+#: build/trans_presets.java:2428
 msgid "Edit Organic Shop"
 msgstr "Modifica negozio di prodotti biologici"
 
 #. item "Shops/Organic" text "Name"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2432
 msgid "Alcohol"
 msgstr "Alcolici (non in Italia)"
@@ -16984,60 +17311,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 "Modifica negozio di alcolici (non in Italia)"
 
 #. item "Shops/Alcohol" text "Name"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2438
 msgid "Beverages"
 msgstr "Bevande"
 
 #. item
-#: build/trans_presets.java:2438
+#: build/trans_presets.java:2439
 msgid "Edit Beverages Shop"
 msgstr "Modifica negozio di bevande"
 
 #. item "Shops/Beverages" text "Name"
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:2443
 msgid "Computer"
 msgstr "Computer"
 
 #. item
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2444
 msgid "Edit Computer Shop"
 msgstr "Modifica negozio di informatica"
 
 #. item "Shops/Computer" text "Name"
-#: build/trans_presets.java:2447
+#: build/trans_presets.java:2448
 msgid "Electronics"
 msgstr "Elettronica"
 
 #. item
-#: build/trans_presets.java:2448
+#: build/trans_presets.java:2449
 msgid "Edit Electronics Shop"
 msgstr "Modifica Negozio di Elettronica"
 
 #. item "Shops/Electronics" text "Name"
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2453
 msgid "Hifi"
 msgstr "Hi-Fi"
 
 #. item
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2454
 msgid "Edit Hifi Shop"
 msgstr "Modifica negozio di Hi-Fi"
 
 #. item "Shops/Hifi" text "Name"
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2458
 msgid "Furniture"
 msgstr "Mobilia"
 
 #. item
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2459
 msgid "Edit Furniture Shop"
 msgstr "Modifica Negozio di Mobilia"
 
 #. item "Shops/Furniture" text "Name"
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2463
 msgid "Garden Centre"
 msgstr "Giardinaggio"
@@ -17045,10 +17372,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 "Modifica giardinaggio"
 
 #. item "Shops/Garden Centre" text "Name"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2469
 msgid "Hardware"
 msgstr "Ferramenta"
@@ -17056,10 +17383,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 "Modifica Negozio di Ferramenta"
 
 #. item "Shops/Hardware" text "Name"
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2475
 msgid "Do-it-yourself-store"
 msgstr "Fai-da-te"
@@ -17067,60 +17394,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 "Modifica negozio Fai-da-te"
 
 #. item "Shops/Do-it-yourself-store" text "Name"
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2481
 msgid "Stationery"
 msgstr "Cartoleria"
 
 #. item
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2482
 msgid "Edit Stationery Shop"
 msgstr "Modifica cartoleria"
 
 #. item "Shops/Stationery" text "Name"
-#: build/trans_presets.java:2485
+#: build/trans_presets.java:2486
 msgid "Hairdresser"
 msgstr "Parrucchiere/barbiere"
 
 #. item
-#: build/trans_presets.java:2486
+#: build/trans_presets.java:2487
 msgid "Edit Hairdresser"
 msgstr "Modifica parrucchiere/barbiere"
 
 #. item "Shops/Hairdresser" text "Name"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2491
 msgid "Shoes"
 msgstr "Calzature"
 
 #. item
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2492
 msgid "Edit Shoe Shop"
 msgstr "Modifica Negozio di Scarpe"
 
 #. item "Shops/Shoes" text "Name"
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2496
 msgid "Toys"
 msgstr "Giocattoli"
 
 #. item
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2497
 msgid "Edit Toy Shop"
 msgstr "Modifica Negozio di Giocattoli"
 
 #. item "Shops/Toys" text "Name"
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2501
 msgid "Video"
 msgstr "Videoteca"
 
 #. item
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2502
 msgid "Edit Video Shop"
 msgstr "Modifica videoteca"
 
 #. item "Shops/Video" text "Name"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2506
 msgid "Dry Cleaning"
 msgstr "Lavanderia a secco"
@@ -17128,10 +17455,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 "Modifica Lavanderia a secco"
 
 #. item "Shops/Dry Cleaning" text "Name"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2512
 msgid "Laundry"
 msgstr "Lavanderia"
@@ -17139,10 +17466,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 "Modifica lavanderia"
 
 #. item "Shops/Laundry" text "Name"
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2518
 msgid "Outdoor"
 msgstr "Sport all'aperto"
@@ -17150,35 +17477,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 "Modifica sport all'aperto"
 
 #. item "Shops/Outdoor" text "Name"
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2524
 msgid "Sports"
 msgstr "Articoli sportivi"
 
 #. item
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2525
 msgid "Edit Sports Shop"
 msgstr "Modifica articoli sportivi"
 
 #. item "Shops/Sports" text "Name"
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2529
 msgid "Optician"
 msgstr "Ottico"
 
 #. item
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2530
 msgid "Edit Optician"
 msgstr "Modifica Ottico"
 
 #. item "Shops/Optician" text "Name"
-#: build/trans_presets.java:2535
+#: build/trans_presets.java:2536
 msgid "Cash"
 msgstr "Contanti"
 
 #. group "Cash"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2537
 msgid "Bank"
 msgstr "Banca"
@@ -17186,5 +17513,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 "Modifica banca"
@@ -17192,10 +17519,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 "Bancomat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2544
 msgid "Money Exchange"
 msgstr "Cambiavalute"
@@ -17203,5 +17530,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 "Modifica cambiavalute"
@@ -17209,15 +17536,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 "Modifica bancomat"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2557
 msgid "Health"
 msgstr "Salute"
 
 #. group "Health"
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2558
 msgid "Doctors"
 msgstr "Ambulatorio"
@@ -17225,20 +17552,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 "Modifica ambulatorio"
 
 #. item "Health/Doctors" text "Name"
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2564
 msgid "Dentist"
 msgstr "Dentista"
 
 #. item
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2565
 msgid "Edit Dentist"
 msgstr "Modifica dentista"
 
 #. item "Health/Dentist" text "Name"
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2569
 msgid "Pharmacy"
 msgstr "Farmacia"
@@ -17246,5 +17573,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 "Modifica Farmacia"
@@ -17252,10 +17579,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 "Vendita medicinali con obbligo di prescrizione"
 
 #. item "Health/Pharmacy" text "Name"
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2576
 msgid "Hospital"
 msgstr "Ospedale"
@@ -17263,10 +17590,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 "Modifica Ospedale"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2582
 msgid "Emergency Access Point"
 msgstr "Colonnina SOS"
@@ -17275,5 +17602,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 "Modifica Colonnina SOS"
@@ -17282,20 +17609,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2588
 msgid "Point Number"
 msgstr "Numero del punto"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2589
 msgid "Point Name"
 msgstr "Nome del punto"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2591
 msgid "Phone Number"
 msgstr "Numero di telefono"
 
 #. 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 "(Usare prefisso internazionale, es. +12-345-67890)"
@@ -17303,5 +17630,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 "Veterinario"
@@ -17310,25 +17637,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 "Modifica veterinario"
 
 #. group "Places"
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2605
 msgid "Continent"
 msgstr "Continente"
 
 #. item
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2606
 msgid "Edit Continent"
 msgstr "Modifica continente"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2611
 msgid "Country"
 msgstr "Stato"
 
 #. item
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2612
 msgid "Edit Country"
 msgstr "Modifica stato"
@@ -17336,30 +17663,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 "Regione"
 
 #. item
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2618
 msgid "Edit State"
 msgstr "Modifica regione"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2622
+#: build/trans_presets.java:2623
 msgid "Region"
 msgstr "Provincia"
 
 #. item
-#: build/trans_presets.java:2623
+#: build/trans_presets.java:2624
 msgid "Edit Region"
 msgstr "Modifica provincia"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2628
+#: build/trans_presets.java:2629
 msgid "County"
 msgstr "Contea (in Italia NON usare)"
 
 #. item
-#: build/trans_presets.java:2629
+#: build/trans_presets.java:2630
 msgid "Edit County"
 msgstr "Modifica contea (in Italia NON usare)"
@@ -17367,15 +17694,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2635
+#: build/trans_presets.java:2636
 msgid "City"
 msgstr "Città"
 
 #. item
-#: build/trans_presets.java:2636
+#: build/trans_presets.java:2637
 msgid "Edit City"
 msgstr "Modifica città"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2641
+#: build/trans_presets.java:2642
 msgid "Town"
 msgstr "Paese"
@@ -17383,10 +17710,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 "Modifica Paese"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2649
 msgid "Suburb"
 msgstr "Sobborgo"
@@ -17394,25 +17721,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 "Modifica Sobborgo"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2656
 msgid "Village"
 msgstr "Frazione"
 
 #. item
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2657
 msgid "Edit Village"
 msgstr "Modifica Frazione"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2662
 msgid "Hamlet"
 msgstr "Borgo"
 
 #. item
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2663
 msgid "Edit Hamlet"
 msgstr "Modifica Borgo"
@@ -17420,5 +17747,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2669
 msgid "Locality"
 msgstr "Luogo che ha un nome, ma non popolato"
@@ -17426,10 +17753,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 "Località"
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2676
 msgid "Island"
 msgstr "Isola"
@@ -17437,5 +17764,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 "Modifica isola"
@@ -17443,5 +17770,5 @@
 #. item "Places/Island" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2683
+#: build/trans_presets.java:2684
 msgid "Cave Entrance"
 msgstr "Entrata di una grotta/caverna"
@@ -17449,10 +17776,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 "Modifica entrata di una grotta/caverna"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2690
 msgid "Peak"
 msgstr "Picco montuoso"
@@ -17460,10 +17787,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 "Modifica picco montuoso"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2697
 msgid "Glacier"
 msgstr "Ghiacciaio"
@@ -17471,10 +17798,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 "Modifica Ghiacciaio"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2703
+#: build/trans_presets.java:2704
 msgid "Volcano"
 msgstr "Vulcano"
@@ -17482,70 +17809,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 "Modifica vulcano"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2711
+#: build/trans_presets.java:2712
 msgid "Boundaries"
 msgstr "Confini"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2713
 msgid "National"
 msgstr "Nazionale"
 
 #. item
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2714
 msgid "Edit National Boundary"
 msgstr "Modifica confine nazionale"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2718
+#: build/trans_presets.java:2719
 msgid "Administrative"
 msgstr "Amministrativo"
 
 #. item
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2720
 msgid "Edit Administrative Boundary"
 msgstr "Modifica confine amministrativo"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2724
+#: build/trans_presets.java:2725
 msgid "Civil"
 msgstr "Civile"
 
 #. item
-#: build/trans_presets.java:2725
+#: build/trans_presets.java:2726
 msgid "Edit Civil Boundary"
 msgstr "Modifica confine civile"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2730
+#: build/trans_presets.java:2731
 msgid "Political"
 msgstr "Politico"
 
 #. item
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:2732
 msgid "Edit Political Boundary"
 msgstr "Modifica confine politico"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2736
+#: build/trans_presets.java:2737
 msgid "National park"
 msgstr "Parco nazionale"
 
 #. item
-#: build/trans_presets.java:2737
+#: build/trans_presets.java:2738
 msgid "Edit National Park Boundary"
 msgstr "Modifica Confine Parco Nazionale"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2744
 msgid "Land use"
 msgstr "Uso del terreno"
 
 #. group "Land use"
-#: build/trans_presets.java:2744
+#: build/trans_presets.java:2745
 msgid "Tree"
 msgstr "Albero"
@@ -17554,15 +17881,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 "Modifica albero singolo"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2753
 msgid "Botanical Name"
 msgstr "Nome Botanico"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2755
 msgid "Wood"
 msgstr "Bosco"
@@ -17571,5 +17898,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 "Modifica bosco"
@@ -17577,17 +17904,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 "Conifere"
 
-#: build/trans_presets.java:2760 build/trans_presets.java:2769
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
 msgid "deciduous"
 msgstr "deciduo (caducifoglie)"
 
-#: build/trans_presets.java:2760 build/trans_presets.java:2769
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
 msgid "mixed"
 msgstr "Mista"
 
-#: build/trans_presets.java:2762
+#: build/trans_presets.java:2763
 msgid "Forest"
 msgstr "Foresta"
@@ -17596,14 +17923,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 "Modifica area di foresta"
 
-#: build/trans_presets.java:2771
+#: build/trans_presets.java:2772
 msgid "Nature Reserve"
 msgstr "Riserva naturale"
 
 #. item
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2773
 msgid "Edit Nature Reserve"
 msgstr "Modifica riserva naturale"
@@ -17611,25 +17938,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2777
+#: build/trans_presets.java:2778
 msgid "Scree"
 msgstr "Ghiaione"
 
 #. item
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:2779
 msgid "Edit Scree"
 msgstr "Modifica Ghiaione"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2783
 msgid "Scrub"
 msgstr "Boscaglia"
 
 #. item
-#: build/trans_presets.java:2783
+#: build/trans_presets.java:2784
 msgid "Edit Scrub"
 msgstr "Modifica boscaglia"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2788
 msgid "Fell"
 msgstr "Fell"
@@ -17637,10 +17964,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 "Modifica Fell"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2794
 msgid "Heath"
 msgstr "Brughiera"
@@ -17648,5 +17975,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 "Modifica brughiera"
@@ -17654,5 +17981,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2801
 msgid "Farmyard"
 msgstr "Aia"
@@ -17661,45 +17988,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 "Modifica aia"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2808
+#: build/trans_presets.java:2809
 msgid "Farmland"
 msgstr "Area agricola"
 
 #. item
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2810
 msgid "Edit Farmland Landuse"
 msgstr "Modifica area agricola"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2814
+#: build/trans_presets.java:2815
 msgid "Meadow"
 msgstr "Prato"
 
 #. item
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2816
 msgid "Edit Meadow Landuse"
 msgstr "Modifica area a prato"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2820
+#: build/trans_presets.java:2821
 msgid "Vineyard"
 msgstr "Vigna"
 
 #. item
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2822
 msgid "Edit Vineyard Landuse"
 msgstr "Modifica area di vigneto"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2826
+#: build/trans_presets.java:2827
 msgid "Allotments"
 msgstr "Area pubblica concessa ai cittadini per la realizzazione di orti"
 
 #. item
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:2828
 msgid "Edit Allotments Landuse"
 msgstr ""
@@ -17708,25 +18035,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2833
+#: build/trans_presets.java:2834
 msgid "Garden"
 msgstr "Giardino"
 
 #. item
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2835
 msgid "Edit Garden"
 msgstr "Modifica giardino"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2838
+#: build/trans_presets.java:2839
 msgid "Grass"
 msgstr "Erba"
 
 #. item
-#: build/trans_presets.java:2839
+#: build/trans_presets.java:2840
 msgid "Edit Grass Landuse"
 msgstr "Modifica area di prato"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2845
 msgid "Village Green"
 msgstr "Village Green"
@@ -17734,10 +18061,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 "Modifica Village Green"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:2852
 msgid "Common"
 msgstr "Common (UK)"
@@ -17745,20 +18072,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 "Modifica una Common (UK)"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2858
 msgid "Park"
 msgstr "Parco"
 
 #. item
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:2859
 msgid "Edit Park"
 msgstr "Modifica parco"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2863
 msgid "Recreation Ground"
 msgstr "Area di svago"
@@ -17766,5 +18093,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 "Modifica area di svago"
@@ -17772,15 +18099,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2871
 msgid "Residential area"
 msgstr "Residential Landuse"
 
 #. item
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2872
 msgid "Edit Residential Landuse"
 msgstr "Modifica Residential Landuse"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2877
 msgid "Graveyard"
 msgstr "Cimitero"
@@ -17788,9 +18115,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 "Modifica Cimitero"
 
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:2885
 msgid "Cemetery"
 msgstr "Cimitero"
@@ -17798,39 +18125,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 "Modifica area di cimitero (esteso)"
 
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2894
 msgid "Retail"
 msgstr "Commerciale (negozi)"
 
 #. item
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2895
 msgid "Edit Retail Landuse"
 msgstr "Modifica area commerciale (negozi)"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2900
 msgid "Commercial"
 msgstr "Commerciale (uffici)"
 
 #. item
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2901
 msgid "Edit Commercial Landuse"
 msgstr "Modifica area commerciale (uffici)"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2906
 msgid "Industrial"
 msgstr "Industriale"
 
 #. item
-#: build/trans_presets.java:2906
+#: build/trans_presets.java:2907
 msgid "Edit Industrial Landuse"
 msgstr "Modifica area industriale"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2912
 msgid "Railway land"
 msgstr "Deposito materiale ferroviario"
@@ -17838,15 +18165,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 "Modifica deposito materiale ferroviario"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:2919
 msgid "Military"
 msgstr "Militare"
 
 #. item
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2920
 msgid "Edit Military Landuse"
 msgstr "Modifica area militare"
@@ -17854,55 +18181,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2925
+#: build/trans_presets.java:2926
 msgid "Construction area"
 msgstr "Area in costruzione"
 
 #. item
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2927
 msgid "Edit Construction Landuse"
 msgstr "Modifica area in costruzione"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2932
 msgid "Brownfield"
 msgstr "Ridestinazione d'uso"
 
 #. item
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:2933
 msgid "Edit Brownfield Landuse"
 msgstr "Modifica area di ridestinazione d'uso"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2937
+#: build/trans_presets.java:2938
 msgid "Greenfield"
 msgstr "Area agricola destinata alla costruzione"
 
 #. item
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:2939
 msgid "Edit Greenfield Landuse"
 msgstr "Modifica area agricola destinata alla costruzione"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:2944
 msgid "Landfill"
 msgstr "Discarica"
 
 #. item
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:2945
 msgid "Edit Landfill Landuse"
 msgstr "Modifica area di discarica"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2950
 msgid "Quarry"
 msgstr "Cava"
 
 #. item
-#: build/trans_presets.java:2950
+#: build/trans_presets.java:2951
 msgid "Edit Quarry Landuse"
 msgstr "Modifica area di cava/miniera"
 
 #. group "Relations"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2960
 msgid "Multipolygon"
 msgstr "Multi-poligono"
@@ -17912,5 +18239,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 "Modifica un multi-poligono"
@@ -17919,10 +18246,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:2970
 msgid "outer segment"
 msgstr "segmento esterno"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:2970
+#: build/trans_presets.java:2971
 msgid "inner segment"
 msgstr "segmento interno"
@@ -17930,5 +18257,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:2974
 msgid "Turn restriction"
 msgstr "Divieto di svolta"
@@ -17937,5 +18264,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 "Modifica un divieto di svolta"
@@ -17943,34 +18270,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 "Divieto"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_left_turn"
 msgstr "no svolta a sinistra"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_right_turn"
 msgstr "no svolta a destra"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_straight_on"
 msgstr "non diritto"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_u_turn"
 msgstr "no inversione di marcia"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "only_right_turn"
 msgstr "solo svolta a destra"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "only_left_turn"
 msgstr "solo svolta a sinistra"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "only_straight_on"
 msgstr "solo diritto"
@@ -17979,15 +18306,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2983
+#: build/trans_presets.java:2984
 msgid "from way"
 msgstr "dal percorso"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2985
 msgid "via node or way"
 msgstr "attraverso il nodo o percorso"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2986
 msgid "to way"
 msgstr "verso il percorso"
@@ -17995,5 +18322,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:2988
+#: build/trans_presets.java:2989
 msgid "Route"
 msgstr "Percorso"
@@ -18002,5 +18329,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 "Modifica un percorso"
@@ -18008,5 +18335,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 "Tipo di percorso"
@@ -18078,5 +18405,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
@@ -18085,17 +18412,17 @@
 msgstr "bicicletta"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "bus"
 msgstr "autobus"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "road"
 msgstr "strada"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "ferry"
 msgstr "traghetto"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "ski"
 msgstr "sci"
@@ -18148,5 +18475,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
@@ -18155,13 +18482,13 @@
 msgstr "pedone"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "hiking"
 msgstr "escursionismo"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "tram"
 msgstr "tram"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "detour"
 msgstr "deviazione"
@@ -18175,10 +18502,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 "metropolitana"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:2997
 msgid "Symbol description"
 msgstr "Descrizione del simbolo"
@@ -18186,26 +18513,26 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:2999
+#: build/trans_presets.java:3000
 msgid "Network"
 msgstr "Rete"
 
 #. item "Relations/Route" combo "State"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "proposed"
 msgstr "proposto"
 
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "alternate"
 msgstr "alternativo"
 
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "temporary"
 msgstr "temporaneo"
 
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "connection"
 msgstr "collegamento"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3003
 msgid "Color (hex)"
 msgstr "Colore (esadecimale)"
@@ -18214,30 +18541,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:3006
 msgid "route segment"
 msgstr "segmento di percorso"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3007
 msgid "forward segment"
 msgstr "segmento diretto"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3008
 msgid "backward segment"
 msgstr "segmento opposto"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3009
 msgid "halt point"
 msgstr "punto di fermata"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3010
 msgid "forward halt point"
 msgstr "punto di fermata diretto"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3011
 msgid "backward halt point"
 msgstr "punto di fermata opposto"
@@ -22352,7 +22679,21 @@
 msgstr "Terraserver Urban"
 
+#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
+#~ msgstr ""
+#~ "Per spostare, ingrandire e rimpicciolire la mappa puoi usare il mouse "
+#~ "oppure premere Ctrl e le frecce, il punto (.) e la virgola (,)."
+
 #~ msgid "Uploading data"
 #~ msgstr "Caricamento dei dati"
 
+#~ msgid "Email"
+#~ msgstr "Email"
+
+#~ msgid "Login name (email) to the OSM account."
+#~ msgstr "Nome utente (email) per l'account di OSM."
+
+#~ msgid "OSM username (email)"
+#~ msgstr "Username OSM (email)"
+
 #~ msgid "Unknown host"
 #~ msgstr "Host sconosciuto"
@@ -22360,4 +22701,11 @@
 #~ msgid "Add either site-josm.xml or Wiki Pages."
 #~ msgstr "Aggiungi sia site-josm.xml che le pagine Wiki."
+
+#~ msgid ""
+#~ "Server returned internal error. Try a reduced area or retry after waiting "
+#~ "some time."
+#~ msgstr ""
+#~ "Il server ha restituito un errore interno. Prova con un'area piccola o "
+#~ "aspetta prima di riprovare."
 
 #~ msgid "Commit comment"
@@ -22415,6 +22763,65 @@
 #~ msgstr "Si vuole veramente impostare la segnalazione come \"completata\"?"
 
+#~ 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 URL.<br><b>Do not use a valuable Password.</b></html>"
+#~ msgstr ""
+#~ "<html>ATTENZIONE: la password è memorizzata in chiaro nel file delle "
+#~ "preferenze.<br>La password è trasferita al server in chiaro, codificata "
+#~ "nell'URL<br><b>Non usare una password importante.</b></html>"
+
 #~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS"
 #~ msgstr "Scarica l'immagine rettificata dal WMS Map Rectifer di Metacarta"
+
+#~ msgid ""
+#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab "
+#~ "- these will then show up in the WMS menu.\n"
+#~ "\n"
+#~ "You can also do this manually in the Advanced Preferences, using the "
+#~ "following schema:\n"
+#~ "wmsplugin.url.1.name=Landsat\n"
+#~ "wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n"
+#~ "wmsplugin.url.2.name=NPE Maps... etc\n"
+#~ "\n"
+#~ "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"
+#~ "\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"
+#~ "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"
+#~ "Note: Make sure the image is suitable, copyright-wise, if in doubt, don't "
+#~ "use."
+#~ msgstr ""
+#~ "Si può aggiungere editare o cancellare le voci WMS nella scheda delle "
+#~ "preferenze di WMSplugin - queste saranno poi visualizzate nel menu WMS.\n"
+#~ "\n"
+#~ "La stessa cosa può essere fatta anche manualmente nelle preferenze "
+#~ "avanzate, usando il seguente schema:\n"
+#~ "wmsplugin.url.1.name=Landsat\n"
+#~ "wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n"
+#~ "wmsplugin.url.2.name=NPE Maps... etc\n"
+#~ "\n"
+#~ "Esempio di formato URL di input WMS completo (landsat)\n"
+#~ "http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n"
+#~ "layers=global_mosaic&styles=&srs=EPSG:4326&\n"
+#~ "format=image/jpeg \n"
+#~ "\n"
+#~ "Per il rettificatore di mappe Metacarta http://labs.metacarta.com/"
+#~ "rectifier/ , è sufficiente inserire l'identificativo pertinente.\n"
+#~ "Per aggiungere una voce al menù relativo al rettificatore di mappe "
+#~ "Metacarta, creare manualmente l'URL come in questo esempio, sostituendo "
+#~ "73 con l'identificativo della propria immagine: \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"
+#~ "Nota: assicurarsi che l'immagine sia adatta ed in regola con i diritti "
+#~ "d'autore. Se si è in dubbio non usarla."
 
 #~ msgid "Portcullis"
@@ -22442,10 +22849,41 @@
 #~ msgstr "viadotto"
 
+#~ msgid "Open the OpenStreetBugs window and activate the automatic download"
+#~ msgstr ""
+#~ "Apri la finestra di OpenStreetBugs e attiva lo scaricamento automatico"
+
 #~ msgid "sports"
 #~ msgstr "Articoli sportivi"
 
+#~ msgid ""
+#~ "Lambert zone {0} in cache  incompatible with current Lambert zone {1}"
+#~ msgstr ""
+#~ "La zona di Lambert {0} nella cache è incompatibile con la zona di Lambert "
+#~ "corrente {1}"
+
 #~ msgid "Delete and Download"
 #~ msgstr "Elimina e Scarica"
 
+#~ msgid "No intersections found. Nothing was changed."
+#~ msgstr "non è stata trovata nessuna intersezione. Nulla è stato cambiato."
+
+#~ msgid ""
+#~ "This action will require {0} individual download requests. Do you wish to "
+#~ "continue?"
+#~ msgstr ""
+#~ "Questa azione richiederà {0} richieste individuali di scaricamento. Si "
+#~ "desidera continuare?"
+
+#~ msgid ""
+#~ "An error occured while trying to match the photos to the GPX track. You "
+#~ "can adjust the sliders to manually match the photos."
+#~ msgstr ""
+#~ "Un errore è stato rilevato durante il tentativo di correlare le foto al "
+#~ "tracciato GPX. E' possibile far corrispondere le foto in modo manuale."
+
+#~ msgid "The following errors occured during mass download:"
+#~ msgstr ""
+#~ "Sono stati rilevati i seguenti errori durante lo scaricamento di massa:"
+
 #~ msgid "Edit Drawbridge"
 #~ msgstr "Modifica ponte levatoio"
@@ -22453,4 +22891,14 @@
 #~ msgid "Edit Portcullis"
 #~ msgstr "Modifica saracinesca"
+
+#~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">english</A>."
+#~ msgstr "Pagina di aiuto mancante. Crearla in <A HREF=\"{0}\">italiano</A>."
+
+#~ msgid ""
+#~ "Helppage missing. Create it in <A HREF=\"{0}\">english</A> or <A HREF="
+#~ "\"{1}\">your language</A>."
+#~ msgstr ""
+#~ "Pagina di aiuto mancante. crearla in <A HREF=\"{0}\">italiano</A> oppure "
+#~ "<A HREF=\"{1}\">la propria lingua</A>."
 
 #~ msgid ""
@@ -22478,4 +22926,18 @@
 #~ msgstr "Non inizializzato"
 
+#~ msgid "Cannot read numeric value from response"
+#~ msgstr "Impossibile leggere valori numerici dalla risposta"
+
 #~ msgid "Data upload failed for unknown reason"
 #~ msgstr "Il caricamento dei dati è fallito per una ragione sconosciuta"
+
+#~ msgid "Resolve conflicts in member list of of relation {0}"
+#~ msgstr "Risolvi conflitti nella lista dei membri della relazione {0}"
+
+#~ msgid ""
+#~ "Properties in the merged element. They will replace properties in my "
+#~ "elements when  merge decisions are applied."
+#~ msgstr ""
+#~ "Proprietà nell'elemento unito. Queste sostituiranno le proprietà presenti "
+#~ "negli elementi personali non appena saranno applicate le decisioni "
+#~ "sull'unione."
Index: applications/editors/josm/i18n/po/ja.po
===================================================================
--- applications/editors/josm/i18n/po/ja.po	(revision 16008)
+++ applications/editors/josm/i18n/po/ja.po	(revision 16009)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-14 16:51+0200\n"
-"PO-Revision-Date: 2009-06-11 01:23+0000\n"
+"POT-Creation-Date: 2009-06-19 21:52+0200\n"
+"PO-Revision-Date: 2009-06-19 03:39+0000\n"
 "Last-Translator: nazotoko <shunw@ics.uci.edu>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2009-06-14 14:44+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 "ヘルプ"
 
 #: ../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 "投影法が設定から読み取れません。メルカトル図法を使います。"
 
@@ -71,6 +71,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
@@ -87,8 +89,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
@@ -137,5 +139,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"
@@ -535,5 +537,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}"
@@ -605,6 +607,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:92
-msgid "Email"
-msgstr "Email"
+msgid "E-Mail"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:96
@@ -642,12 +644,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
@@ -674,5 +678,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
@@ -705,16 +709,13 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:207
 #, java-format
-msgid "Helppage missing. Create it in <A HREF=\"{0}\">english</A>."
-msgstr ""
-"ヘルプページがありません。<A HREF=\"{0}\">英語</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 ""
-"ヘルプページがありません。<A HREF=\"{0}\">英語</A>もしくは<A HREF=\"{1}\">あ"
-"なたの母国語</A>でそれを作成してください。"
 
 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:26
@@ -1144,13 +1145,13 @@
 msgstr "ヘルプ: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:99
 msgid "Status Report"
 msgstr "状況報告"
 
-#: ../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 "クリップボードにコピーして閉じる"
 
-#: ../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
@@ -1348,12 +1349,10 @@
 msgstr "全てを非選択（Escape)"
 
-#: ../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 "データの更新"
 
-#: ../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 ""
@@ -1361,5 +1360,5 @@
 "ターの再ダウンロード)"
 
-#: ../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?"
@@ -1368,86 +1367,258 @@
 "ダウンロードしましたか？"
 
-#: ../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 "この作業は、{0}回のダウンロードを実行します。続けますか？"
-
-#: ../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 "OSMにアップロード"
 
-#: ../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 "OSMサーバにすべての変更をアップロードします。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:96
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:94
 msgid "Objects to add:"
 msgstr "追加するオブジェクト:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102
 msgid "Objects to modify:"
 msgstr "修正するオブジェクト:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:110
 msgid "Objects to delete:"
 msgstr "削除するオブジェクト:"
 
-#: ../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 "アップロードする変更の概略コメントを入力してください。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:126
 msgid "Upload these changes?"
 msgstr "この変更をアップロードしますか?"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:130
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
 msgid "Upload Changes"
 msgstr "変更のアップロード"
 
-#: ../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 "アップロードするものがありません。最初にデータを取得してください。"
 
-#: ../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 "未解決の競合があります。まずこれらの競合を解決してください。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:182
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:180
 msgid "No changes to upload."
 msgstr "アップロードする変更はありません。"
 
-#: ../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 ""
@@ -1552,37 +1723,51 @@
 msgstr "生のGPSデータ"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:44
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:46
 msgid "Downloading data"
 msgstr "データをダウンロード中"
 
-#: ../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 "データーはインポートされませんでした。"
 
-#: ../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 "データーレイヤー {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 "OpenStreetMapデータ"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:37
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:45
 msgid "Data Layer"
 msgstr "データレイヤー"
 
-#: ../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 "ダウンロード {1}のうち{0} (残り {2})"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:88
-msgid "The following errors occured during mass download:"
-msgstr "次のエラーは、大量ダウンロードのときに起きました。"
-
-#: ../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 "ダウンロード中にエラーです。"
+
+#: ../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
@@ -1635,34 +1820,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 "ノードを追加"
 
-#: ../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 "ノードでウェイに追加"
 
-#: ../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 "既存のウェイをノードとつなぎます。"
 
-#: ../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 "既存のウェイに新しいノードを追加"
 
-#: ../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 "ウェイのノードを追加して接続"
 
-#: ../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 "新規ノードの作成"
 
-#: ../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 "カーソルの下のノードを選択"
 
-#: ../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."
@@ -1670,14 +1855,14 @@
 msgstr[0] "新規ノードを {0}このウエイに追加します。"
 
-#: ../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 "新規ウエイを最後に操作したノードから開始"
 
-#: ../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 "最後に操作したノードからウエイを継続"
 
-#: ../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 "描画の完了"
@@ -2006,26 +2191,32 @@
 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 "セレクションのロード"
 
-#: ../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 "連絡先 {0} ..."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:45
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:46
 msgid "Downloading..."
 msgstr "ダウンロード…"
 
-#: ../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 "URL: \"{0}\"から読み込むことができません"
 
-#: ../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 "URL: \"{0}\"の走査エラー"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:74
+msgid "Error while communicating with server."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67
@@ -2085,13 +2276,85 @@
 msgstr "{1}個のオブジェクト中の{0}個の競合を解決"
 
-#: ../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 "削除 {1} {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97
+#, java-format
+msgid "Delete {0} {1}"
+msgstr "削除 {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153
+msgid "Conflicting relation"
+msgstr "競合中のリレーション"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147
+#, java-format
+msgid ""
+"Selection \"{0}\" is used by relation \"{1}\" with role {2}.\n"
+"Delete from relation?"
+msgstr ""
+"選択 \"{0}\" は、関連 \"{1}\" において、ロール {2}として使われています。\n"
+"関連から削除しますか？"
+
+#: ../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 ""
+"選択\"{0}\" は、関連 \"{1}\" で使われています。\n"
+"関連から削除しますか？"
+
+#: ../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 ""
+"ダウンロードしたエリア外のノードを削除しようとしています。<br>（あなたが見て"
+"いない）ほかのオブジェクトが使っているかもしれないので、この操作は問題を引き"
+"起こします。<br>本当に削除しますか？"
+
+#: ../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 "移動"
+
 #: ../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"
@@ -2099,10 +2362,220 @@
 msgstr[0] "ノード"
 
-#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:45
-#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:61
-#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:48
+#: ../core/src/org/openstreetmap/josm/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 "RemoveRelationMember"
+
+#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
+msgid "Rotate"
+msgstr "回転"
+
+#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88
+msgid "Sequence"
+msgstr "シーケンス"
+
+#: ../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 "不正な設定がファイルの{0}行目にあります。"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:324
+#, java-format
+msgid "Cannot open preferences directory: {0}"
+msgstr "情報ディレクトリを読み取れません: {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 ""
+"設定ファイルにエラーがあります。古いファイルのバックアップを{0}に作ります。"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:79
+#, java-format
+msgid "Preferences stored on {0}"
+msgstr "設定は{0}に保存"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:82
+#, java-format
+msgid "Could not upload preferences. Reason: {0}"
+msgstr "設定をアップロードできませんでした。理由: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:93
+msgid "Could not load preferences from server."
+msgstr "サーバから設定をロードできませんでした。"
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:34
+msgid "different"
+msgstr "差異"
+
+#: ../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 "Error: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
+#, java-format
+msgid "Warning: {0}"
+msgstr "Warning: {0}"
+
+#: ../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"
@@ -2110,8 +2583,10 @@
 msgstr[0] "ウェイ"
 
-#: ../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
@@ -2121,266 +2596,27 @@
 msgstr[0] "関連"
 
-#: ../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 "削除 {1} {0}"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97
-#, java-format
-msgid "Delete {0} {1}"
-msgstr "削除 {0} {1}"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153
-msgid "Conflicting relation"
-msgstr "競合中のリレーション"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147
-#, java-format
-msgid ""
-"Selection \"{0}\" is used by relation \"{1}\" with role {2}.\n"
-"Delete from relation?"
-msgstr ""
-"選択 \"{0}\" は、関連 \"{1}\" において、ロール {2}として使われています。\n"
-"関連から削除しますか？"
-
-#: ../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 ""
-"選択\"{0}\" は、関連 \"{1}\" で使われています。\n"
-"関連から削除しますか？"
-
-#: ../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 ""
-"ダウンロードしたエリア外のノードを削除しようとしています。<br>（あなたが見て"
-"いない）ほかのオブジェクトが使っているかもしれないので、この操作は問題を引き"
-"起こします。<br>本当に削除しますか？"
-
-#: ../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 "移動"
-
-#: ../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 "RemoveRelationMember"
-
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
-msgid "Rotate"
-msgstr "回転"
-
-#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88
-msgid "Sequence"
-msgstr "シーケンス"
-
-#: ../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 "不正な設定がファイルの{0}行目にあります。"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:324
-#, java-format
-msgid "Cannot open preferences directory: {0}"
-msgstr "情報ディレクトリを読み取れません: {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 ""
-"設定ファイルにエラーがあります。古いファイルのバックアップを{0}に作ります。"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:79
-#, java-format
-msgid "Preferences stored on {0}"
-msgstr "設定は{0}に保存"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:82
-#, java-format
-msgid "Could not upload preferences. Reason: {0}"
-msgstr "設定をアップロードできませんでした。理由: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:93
-msgid "Could not load preferences from server."
-msgstr "サーバから設定をロードできませんでした。"
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:34
-msgid "different"
-msgstr "差異"
-
-#: ../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 "Error: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
-#, java-format
-msgid "Warning: {0}"
-msgstr "Warning: {0}"
-
-#: ../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"
@@ -2393,5 +2629,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:122
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "railway"
 msgstr "鉄道"
@@ -2411,4 +2647,62 @@
 msgid_plural "{0} nodes"
 msgstr[0] "{0}ノード"
+
+#: ../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
@@ -2557,5 +2851,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 "背景"
@@ -2644,8 +2938,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
@@ -2657,7 +2951,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
@@ -2763,10 +3057,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 "ユーザ名"
 
 #: ../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 "パスワード"
@@ -2862,22 +3156,22 @@
 msgstr "設定 {0} はもう使われていないので、除かれました。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:146
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148
 msgid "File"
 msgstr "ファイル"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150
 msgid "View"
 msgstr "表示"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:149
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151
 msgid "Tools"
 msgstr "ツール"
 
-#: ../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 "プリセット"
 
-#: ../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
@@ -2890,21 +3184,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 "ワイヤー・フレーム表示"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:218
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221
 msgid "Toggle Wireframe view"
 msgstr "ワイヤー・フレーム表示切り替え"
 
-#: ../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 "音声"
@@ -2976,6 +3270,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 "レイヤーがリストにありません。"
@@ -2985,9 +3279,9 @@
 msgstr "OSMサーバに接続…"
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:104
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:105
 msgid "Error while parsing"
 msgstr "解析中にエラー"
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:107
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:108
 msgid "File not found"
 msgstr "ファイルが見つかりません"
@@ -3059,5 +3353,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 "メンバー"
@@ -3253,5 +3547,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
@@ -3333,5 +3627,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 ""
@@ -3370,5 +3664,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 ""
 
@@ -3422,5 +3716,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 "役割"
@@ -3524,5 +3818,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
@@ -3831,5 +4125,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 "リレーション"
@@ -3934,66 +4228,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 "基本"
 
-#: ../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 "次によって占められる;"
 
-#: ../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 "タグ（空の値でタグ自身を削除）"
 
-#: ../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 "現在選択したメンバーを一つ上に移動します"
 
-#: ../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 "選択したものを追加"
 
-#: ../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 "現在選択されている全てのオブジェクトをメンバーとして追加"
 
-#: ../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 "選択の削除"
 
-#: ../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 "現在選択されている全てのオブジェクトを関連から削除"
 
-#: ../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 "選択したメンバーを一つ下に移動します"
 
-#: ../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 "この関連から現在の行のメンバーを削除"
 
-#: ../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 "メンバーのダウンロード"
 
-#: ../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 "この関連の全ての未完成のウェイとノードをダウンロード"
@@ -4038,5 +4332,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
@@ -4057,9 +4351,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
@@ -4081,31 +4375,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 "メンバー: {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 "関連の編集者:{0}"
 
-#: ../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 "インポート中に競合を発見しました。"
 
-#: ../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 "サーバからの応答内容が不正です。"
 
-#: ../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 "サーバに接続できません。"
+
+#: ../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
@@ -4171,17 +4468,17 @@
 msgstr "データソースと型"
 
-#: ../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 "新しいレイヤーとしてダウンロードする"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:174
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:173
 msgid "Download Area"
 msgstr "エリアをダウンロードする"
 
-#: ../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 "ダウンロードするエリアが広すぎます; サーバから拒否されるでしょう"
 
-#: ../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 "ダウンロード領域はOKです。指定のサイズはサーバに受け入れられるでしょう"
@@ -4209,5 +4506,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 "地名"
@@ -4254,21 +4551,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 "タイプ"
@@ -4308,14 +4605,4 @@
 msgid "Tile Numbers"
 msgstr "タイル数"
-
-#: ../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 "ズームやパンにマウスやCtrl+Arrow キー/./を使います。"
-
-#. 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 "マップ"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:98
@@ -4393,5 +4680,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)"
@@ -4507,14 +4794,14 @@
 msgstr "WAV音声ファイル(*.wav)"
 
-#: ../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 "{0} からの音声マーカー"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244
 msgid "Import images"
 msgstr "イメージのインポート"
 
-#: ../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, "
@@ -4522,5 +4809,5 @@
 msgstr[0] "{0} トラック "
 
-#: ../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, "
@@ -4528,5 +4815,5 @@
 msgstr[0] "{0}ルート, "
 
-#: ../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"
@@ -4534,28 +4821,28 @@
 msgstr[0] "{0} ウェイポイント"
 
-#: ../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 "名前: {0}"
 
-#: ../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 "記述: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347
 msgid "Timespan: "
 msgstr "Timespan: "
 
-#: ../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 "データレイヤーへ変換"
 
-#: ../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 ""
@@ -4567,11 +4854,11 @@
 "てください："
 
-#: ../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
@@ -4581,29 +4868,29 @@
 msgstr "{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 "このトラックに沿ってOSMからダウンロード"
 
-#: ../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 "{0} メータ"
 
-#: ../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 "{0} 平方キロメートル"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:822
 #, java-format
 msgid ""
@@ -4614,9 +4901,9 @@
 "すか？</html>"
 
-#: ../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 "音声に関連づいたGPXトラックがこのレイヤーにありません。"
 
-#: ../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 "
@@ -4626,5 +4913,5 @@
 "に変更又は移動されました。"
 
-#: ../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 "
@@ -4634,33 +4921,42 @@
 "外します。"
 
-#: ../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 "バージョン {0}"
 
-#: ../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 "{0}は次からなります:"
 
-#: ../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}は削除されました)"
 
-#: ../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 "APIバージョン: {0}"
 
-#: ../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"
@@ -4668,21 +4964,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"
@@ -4823,5 +5119,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
@@ -4830,5 +5126,5 @@
 msgstr "編集する列を選択してください。"
 
-#: ../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
@@ -4836,5 +5132,5 @@
 msgstr "新しい値は{0}"
 
-#: ../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
@@ -4844,5 +5140,5 @@
 msgstr "削除する列を選択してください。"
 
-#: ../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 "新しいキー/値の組を入力"
@@ -5732,106 +6028,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 "名前"
@@ -6300,6 +6596,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:36
-msgid "Login name (email) to the OSM account."
-msgstr "OSMアカウントのログイン名（email)"
+msgid "Login name (e-mail) to the OSM account."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
@@ -6313,6 +6609,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
-msgid "OSM username (email)"
-msgstr "OSMユーザ名（email）"
+msgid "OSM username (e-mail)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
@@ -6323,10 +6619,7 @@
 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 ""
-"<html>警告：パスワードは平文で設定ファイルに格納されます。<br>パスワードは、"
-"URLに付加されて平文でサーバに送信されます。<br><b>他で使用しているパスワード"
-"は使用しないでください。</b></html>"
 
 #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on
@@ -6625,6 +6918,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 "OSMサーバに接続中..."
@@ -6635,7 +6929,7 @@
 msgstr "{1}にポイント{0}をダウンロード中..."
 
-#: ../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 "OSMデータをダウンロード中..."
@@ -6700,15 +6994,14 @@
 msgstr "NMEAインポートの失敗！"
 
-#: ../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 "このバージョンのJOSMは、設定されたサーバーと互換性がありません。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:207
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172
 #, java-format
 msgid ""
@@ -6719,31 +7012,37 @@
 "は、 {0} から {1}をサポートするといっています。"
 
-#: ../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 "プロトコルバージョン {1}を使った確立された{0}で通信する。"
 
-#: ../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 "変更セットを開いています…"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:351
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298
 msgid "Closing changeset..."
 msgstr "変更した設定を閉じています..."
 
-#: ../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 "diffアップロードのための変更セットを用意できませんでした。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:376
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:321
 msgid "Preparing..."
 msgstr "準備中..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:381
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:326
 msgid "Uploading..."
 msgstr "アップロード中..."
@@ -6758,25 +7057,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 "正しくないパスワードかユーザ名です。"
 
-#: ../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 "警告:パスワードは暗号化されずに送信されます。"
 
-#: ../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 "ユーザーとパスワードを保存します(暗号化されません)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:89
 msgid "Enter Password"
 msgstr "パスワードを入力して下さい"
 
-#: ../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..."
@@ -6787,4 +7086,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."
@@ -6877,26 +7219,32 @@
 msgstr "III-形式のノードID"
 
-#: ../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 "サーバに接続中..."
 
-#: ../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 "osmサーバに接続できません。インターネット接続 をチェックしてください。"
 
-#: ../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 ""
-"サーバが内部エラーを返しました。しばらく待ってから試すか、領域指定を縮小して"
-"試してください。"
-
-#: ../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 ""
 
@@ -6912,5 +7260,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 "ダウンロードプラグイン"
@@ -7099,9 +7447,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 "不足するプラグインをダウンロードします。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:128
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:119
 #, java-format
 msgid ""
@@ -7114,6 +7462,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
@@ -7136,35 +7484,35 @@
 msgstr "不明な"
 
-#: ../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}: Version {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 "JOSMに付属のプラグイン"
 
-#: ../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 "Error reading plugin information file: {0}"
 
-#: ../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 "これは記録の最後より後ろにあります。"
 
-#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:329
+#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:340
 msgid "Error playing sound"
 msgstr "サウンドの再生でエラーが発生しています"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
 msgid "Do nothing"
 msgstr "何もしない"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
 msgid "Report Bug"
 msgstr "バグを報告する"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:52
 msgid ""
 "An unexpected exception occurred.\n"
@@ -7179,18 +7527,18 @@
 "大目にみて、ぜひバグレポートをぜひお願いします。"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55
 msgid "Unexpected Exception"
 msgstr "予期しない例外"
 
-#: ../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 "{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 "（できる限り詳細に）エラーが発生するまでの手順を含めてください！"
 
-#: ../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 "
@@ -7200,9 +7548,9 @@
 "ださい。"
 
-#: ../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 "必ず次の情報を含めること:"
 
-#: ../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 "(テキストはクリップボードにコピーされています。)"
@@ -7287,5 +7635,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 "説明"
@@ -7669,9 +8017,7 @@
 #: ../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 ""
-"GPXトラックに写真を合わせようとしているときにエラーが起きました。スライダーを"
-"調整して、手動で写真に合わせることができます。"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:853
@@ -7703,5 +8049,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"
@@ -7724,5 +8069,5 @@
 msgstr "Lambert Zone 4 cache file (.4)"
 
-#: ../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
@@ -7817,6 +8162,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/"
@@ -7893,6 +8238,6 @@
 msgstr "\"source=...\" を要素に追加しますか？"
 
-#: ../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
@@ -7900,11 +8245,11 @@
 msgstr "ダウンロード {0}"
 
-#: ../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 "WMSサーバに接続中..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:157
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:158
 msgid "Create buildings"
 msgstr "ビルの作成"
@@ -7921,13 +8266,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 "SVG ViewBoxを取り出し..."
 
-#: ../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 "行政区画の作成"
@@ -7948,5 +8293,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 "フランスのCadastre WMSからイメージのダウンロード"
 
@@ -8040,5 +8385,5 @@
 "Select one of them first, then retry"
 
-#: ../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
@@ -8046,59 +8391,28 @@
 msgstr "ブランクのレイヤー"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:176
 #, java-format
 msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr "WMSレイヤー ({0}), {1}このタイル読み込み"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:183
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:178
 msgid "Is not vectorized."
 msgstr "ベクターではありません。"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:179
 #, java-format
 msgid "Raster center: {0}"
 msgstr "ラスター画像の中央: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181
 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 "都道府県 bbox: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:282
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
-msgid "Save WMS layer to file"
-msgstr "WMSレイヤーをファイルに保存"
-
-#: ../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 "WMSレイヤーをファイルから読み込む"
-
-#: ../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 "未サポートの WMSファイルのバージョン; 発見 {0}, 予想 {1}"
-
-#: ../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 ""
@@ -8107,14 +8421,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 "ランベルトゾーンキャッシュエラー"
@@ -8209,11 +8523,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 "GPXレイヤーからパスをインポート"
 
 #: ../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 "今あるパスをドロップ"
@@ -8223,5 +8537,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 "GPXデータのレイヤーがありません"
@@ -8513,4 +8827,8 @@
 msgid "Lakewalker trace"
 msgstr "Lakewalkerトレース"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:10
+msgid "An unknown error has occurred"
+msgstr ""
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
@@ -8823,42 +9141,42 @@
 msgstr "LiveGPS"
 
-#: ../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 "測定するレイヤー"
@@ -8917,6 +9235,6 @@
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
-msgid "Open the OpenStreetBugs window and activate the automatic download"
-msgstr "OpenStreetBugsウインドウを開き、自動ダウンロードを行います。"
+msgid "Opens the OpenStreetBugs window and activates the automatic download"
+msgstr ""
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:123
@@ -8991,5 +9309,5 @@
 msgstr "Osmarender"
 
-#: ../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 "
@@ -8999,9 +9317,9 @@
 "を設定してください。"
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:123
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:127
 msgid "osmarender options"
 msgstr "osmarenderオプション"
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:124
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:128
 msgid "Firefox executable"
 msgstr "Firefoxの実行ファイル"
@@ -9432,5 +9750,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 "ストリートの名前"
@@ -9520,5 +9838,5 @@
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:195
-msgid "No intersections found. Nothing was changed."
+msgid "No intersection found. Nothing was changed."
 msgstr ""
 
@@ -10386,19 +10704,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 "WMSプラグイン　ヘルプ"
@@ -10457,5 +10774,5 @@
 msgstr "選択されたWMSレイヤーの位置を調整してください。"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113
 #, java-format
 msgid ""
@@ -10499,4 +10816,29 @@
 msgid "Alpha channel"
 msgstr "アルファチャンネル"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
+msgid "Save WMS layer to file"
+msgstr "WMSレイヤーをファイルに保存"
+
+#: ../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 "WMSレイヤーをファイルから読み込む"
+
+#: ../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 "未サポートの WMSファイルのバージョン; 発見 {0}, 予想 {1}"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:335
+msgid "File Format Error"
+msgstr "ファイルフォーマットエラー"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:163
@@ -10591,4 +10933,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 ""
@@ -10603,5 +10950,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 ""
 
@@ -10887,5 +11234,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 "道路番号"
@@ -11387,5 +11734,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 "幅(m)"
@@ -11854,7 +12201,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 "タイプ"
@@ -12470,10 +12817,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 "操作員"
@@ -12685,7 +13032,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 "高度"
@@ -13620,5 +13967,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 "料金"
@@ -13754,5 +14101,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 "リファレンス (ホームの番号)"
@@ -13760,5 +14107,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 "エリア"
@@ -13810,11 +14157,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 "バス乗り場の編集"
@@ -13822,5 +14179,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1512
+#: build/trans_presets.java:1513
 msgid "Taxi"
 msgstr "タクシー"
@@ -13828,5 +14185,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 "タクシー乗り場の編集"
@@ -13834,5 +14191,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1519
+#: build/trans_presets.java:1520
 msgid "Airport"
 msgstr "空港"
@@ -13840,15 +14197,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 "IATA"
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1527
+#: build/trans_presets.java:1528
 msgid "ICAO"
 msgstr "ICAO"
@@ -13857,5 +14214,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1532
+#: build/trans_presets.java:1533
 msgid "Accomodation"
 msgstr "宿泊施設"
@@ -13867,5 +14224,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 "ホテル"
@@ -13874,15 +14231,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 "モーテル"
@@ -13890,20 +14247,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 "シャレー風の別荘、シャレー"
@@ -13911,10 +14268,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 "ホステル"
@@ -13922,30 +14279,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 "キャンプ場"
@@ -13953,10 +14310,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 "飲食店"
@@ -13967,5 +14324,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 "レストラン"
@@ -13973,5 +14330,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 "レストランの編集"
@@ -13979,5 +14336,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 "料理の種類"
@@ -13985,61 +14342,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 "ファーストフード"
@@ -14047,9 +14404,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 "カフェ"
@@ -14057,10 +14414,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 "パブ、居酒屋"
@@ -14068,20 +14425,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 "バー"
@@ -14089,10 +14446,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 "ナイトクラブ"
@@ -14100,20 +14457,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 "アトラクションの編集"
@@ -14122,11 +14479,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 "博物館"
@@ -14134,10 +14491,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 "動物園"
@@ -14146,10 +14503,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 "観覧台"
@@ -14157,25 +14514,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 "View pointの編集"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1652
+#: build/trans_presets.java:1653
 msgid "Look-Out Tower"
 msgstr "Look-Out Tower"
 
 #. 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 "美術館"
@@ -14183,5 +14540,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 "美術館の編集"
@@ -14189,5 +14546,5 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1667
 msgid "Information Office"
 msgstr "案内所"
@@ -14195,83 +14552,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 "マップ"
+
 #. 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 "board"
 
-#: 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 "シェルターの編集"
@@ -14279,25 +14633,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 "城"
@@ -14306,20 +14660,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 "遺跡(ruins)の編集"
 
 #. item "Historic Places/Ruins" text "Name"
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1729
 msgid "Archaeological Site"
 msgstr "遺跡（群）"
@@ -14328,10 +14682,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 "戦場"
@@ -14339,5 +14693,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 "戦場の編集"
@@ -14345,15 +14699,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 "記念碑(戦争記念などの)"
@@ -14361,45 +14715,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 "遊び場"
@@ -14407,15 +14761,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 "つりの編集"
@@ -14423,15 +14777,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 "スタジアムの編集"
@@ -14445,6 +14799,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 "スポーツ選択："
@@ -14820,6 +15174,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
@@ -14852,227 +15206,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
+msgstr "運動場"
+
+#. item
+#: build/trans_presets.java:1804
 msgid "Edit Pitch"
-msgstr "ピッチの編集"
-
-#: build/trans_presets.java:1811
+msgstr "運動場の編集"
+
+#: 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 "Multiの編集"
@@ -15111,191 +15465,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
+msgstr "運動場"
+
+#: 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 "スキー"
@@ -15303,56 +15657,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 "難易度"
 
 #. 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 "初球"
 
-#: 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 "エキスパート"
 
-#: 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 "射撃"
@@ -15360,127 +15714,127 @@
 #. 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 "野球"
 
 #. item
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:1960
 msgid "Edit Baseball"
 msgstr "野球場の編集"
 
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:1965
 msgid "Basketball"
 msgstr "バスケットボール"
 
 #. item
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:1966
 msgid "Edit Basketball"
 msgstr "バスケットボール場の編集"
 
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:1971
 msgid "Golf"
 msgstr "ゴルフ"
 
 #. 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 "クリケット"
 
 #. item
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:1990
 msgid "Edit Cricket"
 msgstr "クリケットの編集"
 
-#: 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 "ペロタ"
@@ -15488,51 +15842,51 @@
 #  ペロタ 《スペイン・南米・フィリピンなどで行なわれる球技; ハイアライ (jai alai) に発展》.
 #. 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 "ラグビー"
 
 #. item
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2026
 msgid "Edit Rugby"
 msgstr "ラグビー場の編集"
 
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:2031
 msgid "Table Tennis"
 msgstr "卓球"
 
 #. item
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2032
 msgid "Edit Table Tennis"
 msgstr "卓球の編集"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2037
 msgid "Tennis"
 msgstr "テニス"
 
 #. item
-#: build/trans_presets.java:2037
+#: build/trans_presets.java:2038
 msgid "Edit Tennis"
 msgstr "テニスの編集"
 
 #. <separator/>
-#: build/trans_presets.java:2044
+#: build/trans_presets.java:2045
 msgid "Buildings"
 msgstr "ビル"
 
 #. group "Buildings"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2046
 msgid "Building"
 msgstr "ビル"
@@ -15540,5 +15894,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2049
 msgid "Public Building"
 msgstr "公共のビル"
@@ -15546,10 +15900,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 "役場"
@@ -15557,10 +15911,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 "役場の編集"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2061
 msgid "Embassy"
 msgstr "大使館"
@@ -15568,10 +15922,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 "大使館の編集"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2066
+#: build/trans_presets.java:2067
 msgid "Courthouse"
 msgstr "裁判所"
@@ -15580,10 +15934,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 "裁判所の編集"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2074
 msgid "Prison"
 msgstr "刑務所"
@@ -15592,10 +15946,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 "刑務所の編集"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2080
+#: build/trans_presets.java:2081
 msgid "Police"
 msgstr "警察"
@@ -15605,10 +15959,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 "警察署・交番の編集"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2089
 msgid "Fire Station"
 msgstr "消防署"
@@ -15617,10 +15971,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 "消防署の編集"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2096
 msgid "Post Office"
 msgstr "郵便局"
@@ -15628,5 +15982,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 "郵便局の編集"
@@ -15634,15 +15988,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2103
 msgid "Kindergarten"
 msgstr "幼稚園"
 
 #. item
-#: build/trans_presets.java:2103
+#: build/trans_presets.java:2104
 msgid "Edit Kindergarten"
 msgstr "幼稚園の編集"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2108
 msgid "School"
 msgstr "学校"
@@ -15650,10 +16004,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 "学校の編集"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2114
 msgid "University"
 msgstr "大学"
@@ -15661,10 +16015,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 "大学の編集"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2120
 msgid "College"
 msgstr "短大"
@@ -15672,5 +16026,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 "短大の編集"
@@ -15678,5 +16032,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2126
+#: build/trans_presets.java:2127
 msgid "Cinema"
 msgstr "映画館"
@@ -15685,10 +16039,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 "映画館の編集"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2133
+#: build/trans_presets.java:2134
 msgid "Library"
 msgstr "図書館"
@@ -15697,10 +16051,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 "図書館の編集"
 
 #. item "Buildings/Library" text "Name"
-#: build/trans_presets.java:2140
+#: build/trans_presets.java:2141
 msgid "Arts Centre"
 msgstr "美術館"
@@ -15708,10 +16062,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 "劇場"
@@ -15720,10 +16074,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 "劇場の編集"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2154
 msgid "Place of Worship"
 msgstr "礼拝所"
@@ -15733,5 +16087,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 "礼拝所の編集"
@@ -15740,6 +16094,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 "宗教"
@@ -15748,66 +16102,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 "仏教"
 
-#: 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 "キリスト教"
 
-#: 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 "ヒンズー教"
 
-#: 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 "ユダヤ教"
 
-#: 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 "ムスリム"
 
-#: 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 "シーク教"
 
-#: 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 "降霊術士、イタコ"
 
-#: 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 "道教"
 
-#: 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 "ゾロアスター教"
 
-#: 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 "宗派"
@@ -15816,81 +16170,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 "英国教会系"
 
-#: 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 "バプチスト"
 
-#: 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 "カトリック"
 
-#: 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 "福音派"
 
-#: 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 "ものみの塔、エホバの証人"
 
-#: 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 "ルター派"
 
-#: 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 "メソジスト派"
 
-#: 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 "モルモン"
 
-#: 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 "ギリシャ正教系"
 
-#: 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 "ペンテコステ派"
 
-#: 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 "長老派"
 
-#: 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 "プロテスタント"
 
-#: 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 "クエーカー教徒"
 
-#: 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 "住所"
@@ -15899,5 +16253,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 "住所情報の編集"
@@ -15905,5 +16259,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2169
+#: build/trans_presets.java:2170
 msgid "House number"
 msgstr "いえ番号"
@@ -15911,20 +16265,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2172
 msgid "House name"
 msgstr "家の名前"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2174
 msgid "City name"
 msgstr "都市名"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2174
+#: build/trans_presets.java:2175
 msgid "Post code"
 msgstr "郵便番号"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2176
 msgid "Country code"
 msgstr "国コード"
@@ -15932,5 +16286,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2179
 msgid "Address Interpolation"
 msgstr "住所の補間"
@@ -15939,5 +16293,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 "住所の補間を編集"
@@ -15945,71 +16299,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 "奇数"
 
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2184
 msgid "even"
 msgstr "偶数"
 
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2184
 msgid "all"
 msgstr "全て"
 
-#: 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 "人工物"
 
 #. group "Man Made"
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2188
 msgid "Works"
 msgstr "工場"
 
 #. item
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2189
 msgid "Edit Works"
 msgstr "工場の編集"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2193
 msgid "Tower"
 msgstr "タワー"
 
 #. item
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2194
 msgid "Edit Tower"
 msgstr "タワーの編集"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2198
 msgid "Water Tower"
 msgstr "水道塔"
 
 #. item
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2199
 msgid "Edit Water Tower"
 msgstr "水道塔の編集"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2203
 msgid "Gasometer"
 msgstr "ガスタンク"
 
 #. item
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2204
 msgid "Edit Gasometer"
 msgstr "ガスタンクの編集"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2207
+#: build/trans_presets.java:2208
 msgid "Lighthouse"
 msgstr "灯台"
@@ -16017,10 +16371,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 "灯台の編集"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2214
 msgid "Windmill"
 msgstr "風車"
@@ -16028,10 +16382,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 "風車の編集"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2220
 msgid "Pipeline"
 msgstr "パイプライン"
@@ -16039,10 +16393,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 "パイプラインの編集"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2225
+#: build/trans_presets.java:2226
 msgid "Wastewater Plant"
 msgstr "下水処理場"
@@ -16052,10 +16406,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 "クレーン"
@@ -16063,10 +16417,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 "クレーンの編集"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2239
+#: build/trans_presets.java:2240
 msgid "Beacon"
 msgstr "ビーコン"
@@ -16074,10 +16428,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 "誘導灯の編集"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2245
+#: build/trans_presets.java:2246
 msgid "Survey Point"
 msgstr "調査ポイント"
@@ -16085,10 +16439,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 "測点の編集"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2252
 msgid "Surveillance"
 msgstr "監視カメラ"
@@ -16096,5 +16450,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 "監視カメラの編集"
@@ -16102,5 +16456,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2258
+#: build/trans_presets.java:2259
 msgid "Power Generator"
 msgstr "発電機"
@@ -16110,39 +16464,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 "発電機の編集"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "wind"
 msgstr "風"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "hydro"
 msgstr "水力発電"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "fossil"
 msgstr "火力発電"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "nuclear"
 msgstr "原子力"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "coal"
 msgstr "石炭"
 
-#: 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 "ガス"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2268
 msgid "Power Station"
 msgstr "変電所"
@@ -16151,10 +16505,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 "変電所の編集"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2274
+#: build/trans_presets.java:2275
 msgid "Power Sub Station"
 msgstr "発電サブステーション"
@@ -16163,5 +16517,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 "配電所の編集"
@@ -16169,10 +16523,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 "送電塔"
@@ -16183,5 +16537,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 "送電塔の編集"
@@ -16189,5 +16543,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 "送電線"
@@ -16196,25 +16550,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 "電圧"
 
 #. 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 "トイレ"
@@ -16222,20 +16576,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 "備考"
 
 #. 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 "電話"
@@ -16244,5 +16598,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 "電話を編集"
@@ -16250,5 +16604,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 "コイン"
@@ -16256,5 +16610,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 "備考"
@@ -16262,5 +16616,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 "電子マネー"
@@ -16268,5 +16622,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 "デビットカード"
@@ -16274,15 +16628,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 "クレジットカード"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2328
 msgid "Telephone cards"
 msgstr "テレフォンカード"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2330
 msgid "Recycling"
 msgstr "リサイクル"
@@ -16291,5 +16645,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 "リサイクルステーションの編集"
@@ -16297,35 +16651,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 "バッテリー"
 
 #. 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 "被服"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2338
 msgid "Glass"
 msgstr "ガラス"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2339
 msgid "Paper"
 msgstr "紙"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2340
 msgid "Scrap Metal"
 msgstr "スクラップ金属"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2342
 msgid "Bench"
 msgstr "ベンチ"
@@ -16334,20 +16688,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 "Hunting Stand"
 
 #. item
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2347
 msgid "Edit Hunting Stand"
 msgstr "Hunting Standの編集"
 
 #. item "Amenities/Hunting Stand" check "Shelter"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2350
 msgid "Hide"
 msgstr "隠す"
 
 #. item "Amenities/Hunting Stand" check "Hide"
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2351
 msgid "Lock"
 msgstr "ロック"
@@ -16355,22 +16709,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 "高さ"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2351
+#: build/trans_presets.java:2352
 msgid "low"
 msgstr "低い"
 
-#: build/trans_presets.java:2351
+#: build/trans_presets.java:2352
 msgid "half"
 msgstr "半分"
 
-#: build/trans_presets.java:2351
+#: build/trans_presets.java:2352
 msgid "full"
 msgstr "完全"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2354
 msgid "Fountain"
 msgstr "噴水"
@@ -16379,10 +16733,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 "噴水の編集"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2361
 msgid "Drinking Water"
 msgstr "飲料水"
@@ -16391,10 +16745,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 "飲料水の編集"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2367
+#: build/trans_presets.java:2368
 msgid "Baby Hatch"
 msgstr "赤ちゃんポスト"
@@ -16402,25 +16756,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 "店舗"
 
 #. group "Shops"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2377
 msgid "Supermarket"
 msgstr "スーパーマーケット"
 
 #. item
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2378
 msgid "Edit Supermarket"
 msgstr "スーパーマーケットの編集"
 
 #. item "Shops/Supermarket" text "Name"
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:2382
 msgid "Convenience Store"
 msgstr "コンビニエンスストア"
@@ -16428,10 +16782,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 "キオスク"
@@ -16439,10 +16793,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 "キオスクの編集"
 
 #. item "Shops/Kiosk" text "Name"
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2394
 msgid "Vending machine"
 msgstr "自動販売機"
@@ -16450,5 +16804,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 "自動販売機の編集"
@@ -16456,88 +16810,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 "公共_交通_チケット"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "public_transport_plans"
 msgstr ""
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "parking_tickets"
 msgstr "パーキングチケット"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "food"
 msgstr "食料"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "drinks"
 msgstr "飲料"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "sweets"
 msgstr "甘味"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "cigarettes"
 msgstr "たばこ"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "photos"
 msgstr "写真"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "animal_food"
 msgstr "ペットフード"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "news_papers"
 msgstr "新聞"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "toys"
 msgstr "おもちゃ"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "stamps"
 msgstr "切手"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "SIM-cards"
 msgstr "携帯の契約"
 
-#: 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 "コンドーム"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "tampons"
 msgstr "タンポン"
 
-#: 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 "精肉店"
@@ -16545,10 +16899,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 "精肉店の編集"
 
 #. item "Shops/Butcher" text "Name"
-#: build/trans_presets.java:2414
+#: build/trans_presets.java:2415
 msgid "Baker"
 msgstr "パン屋"
@@ -16556,10 +16910,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 "パン屋の編集"
 
 #. item "Shops/Baker" text "Name"
-#: build/trans_presets.java:2420
+#: build/trans_presets.java:2421
 msgid "Florist"
 msgstr "生花店"
@@ -16567,20 +16921,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 "生花店の編集"
 
 #. 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 ""
@@ -16588,60 +16942,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 "飲料店"
 
 #. 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 "コンピュータ店"
 
 #. item
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2444
 msgid "Edit Computer Shop"
 msgstr "コンピュータ店の編集"
 
 #. item "Shops/Computer" text "Name"
-#: build/trans_presets.java:2447
+#: build/trans_presets.java:2448
 msgid "Electronics"
 msgstr "家電店"
 
 #. item
-#: build/trans_presets.java:2448
+#: build/trans_presets.java:2449
 msgid "Edit Electronics Shop"
 msgstr "家電店の編集"
 
 #. 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 "家具店"
 
 #. item
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2459
 msgid "Edit Furniture Shop"
 msgstr "家具店の編集"
 
 #. item "Shops/Furniture" text "Name"
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2463
 msgid "Garden Centre"
 msgstr "園芸用品店"
@@ -16649,10 +17003,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 "園芸用品店の編集"
 
 #. item "Shops/Garden Centre" text "Name"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2469
 msgid "Hardware"
 msgstr "金物屋"
@@ -16660,10 +17014,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 "金物屋の編集"
 
 #. item "Shops/Hardware" text "Name"
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2475
 msgid "Do-it-yourself-store"
 msgstr "DIYショップ"
@@ -16671,60 +17025,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 "DIYショップの編集"
 
 #. item "Shops/Do-it-yourself-store" text "Name"
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2481
 msgid "Stationery"
 msgstr "文具店"
 
 #. item
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2482
 msgid "Edit Stationery Shop"
 msgstr "文具店の編集"
 
 #. item "Shops/Stationery" text "Name"
-#: build/trans_presets.java:2485
+#: build/trans_presets.java:2486
 msgid "Hairdresser"
 msgstr "美容院"
 
 #. item
-#: build/trans_presets.java:2486
+#: build/trans_presets.java:2487
 msgid "Edit Hairdresser"
 msgstr "美容院の編集"
 
 #. item "Shops/Hairdresser" text "Name"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2491
 msgid "Shoes"
 msgstr "靴店"
 
 #. item
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2492
 msgid "Edit Shoe Shop"
 msgstr "靴店の編集"
 
 #. item "Shops/Shoes" text "Name"
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2496
 msgid "Toys"
 msgstr "おもちゃ屋"
 
 #. item
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2497
 msgid "Edit Toy Shop"
 msgstr "おもちゃ屋の編集"
 
 #. item "Shops/Toys" text "Name"
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2501
 msgid "Video"
 msgstr "ビデオ"
 
 #. item
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2502
 msgid "Edit Video Shop"
 msgstr "ビデオショップの編集"
 
 #. item "Shops/Video" text "Name"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2506
 msgid "Dry Cleaning"
 msgstr "クリーニング店"
@@ -16732,10 +17086,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 "クリーニング店の編集"
 
 #. item "Shops/Dry Cleaning" text "Name"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2512
 msgid "Laundry"
 msgstr "ランドリー"
@@ -16743,10 +17097,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 "ランドリーの編集"
 
 #. item "Shops/Laundry" text "Name"
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2518
 msgid "Outdoor"
 msgstr "アウトドア店"
@@ -16754,35 +17108,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 "アウトドア店の編集"
 
 #. item "Shops/Outdoor" text "Name"
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2524
 msgid "Sports"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2525
 msgid "Edit Sports Shop"
 msgstr "スポーツ店"
 
 #. item "Shops/Sports" text "Name"
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2529
 msgid "Optician"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2530
 msgid "Edit Optician"
 msgstr "眼鏡屋の編集"
 
 #. item "Shops/Optician" text "Name"
-#: build/trans_presets.java:2535
+#: build/trans_presets.java:2536
 msgid "Cash"
 msgstr "お金"
 
 #. group "Cash"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2537
 msgid "Bank"
 msgstr "銀行"
@@ -16790,5 +17144,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 "銀行の編集"
@@ -16796,10 +17150,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 "ATM"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2544
 msgid "Money Exchange"
 msgstr "両替"
@@ -16807,5 +17161,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 "両替の編集"
@@ -16813,15 +17167,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 "ATMの編集"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2557
 msgid "Health"
 msgstr "健康"
 
 #. group "Health"
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2558
 msgid "Doctors"
 msgstr "医院"
@@ -16829,20 +17183,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 "医院の編集"
 
 #. item "Health/Doctors" text "Name"
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2564
 msgid "Dentist"
 msgstr "歯科医院"
 
 #. item
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2565
 msgid "Edit Dentist"
 msgstr "歯科医院の編集"
 
 #. item "Health/Dentist" text "Name"
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2569
 msgid "Pharmacy"
 msgstr "薬局"
@@ -16850,5 +17204,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 "薬局の編集"
@@ -16856,10 +17210,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 "調剤薬局"
 
 #. item "Health/Pharmacy" text "Name"
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2576
 msgid "Hospital"
 msgstr "病院"
@@ -16867,10 +17221,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 "病院の編集"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2582
 msgid "Emergency Access Point"
 msgstr "夜間急病センター"
@@ -16879,5 +17233,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 "夜間急病センターの編集"
@@ -16886,20 +17240,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2588
 msgid "Point Number"
 msgstr "ポイント数"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2589
 msgid "Point Name"
 msgstr "ポイント名"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2591
 msgid "Phone Number"
 msgstr "電話番号"
 
 #. 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 "(+81-3-3345-6789のような国際で通用する電話番号を使ってください)"
@@ -16907,5 +17261,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 "動物病院"
@@ -16914,25 +17268,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 "動物病院の編集"
 
 #. group "Places"
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2605
 msgid "Continent"
 msgstr "大陸"
 
 #. item
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2606
 msgid "Edit Continent"
 msgstr "大陸の編集"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2611
 msgid "Country"
 msgstr "国(country)"
 
 #. item
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2612
 msgid "Edit Country"
 msgstr "国(country)の編集"
@@ -16940,30 +17294,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 "州(state)"
 
 #. item
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2618
 msgid "Edit State"
 msgstr "州(state)の編集"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2622
+#: build/trans_presets.java:2623
 msgid "Region"
 msgstr "地方"
 
 #. item
-#: build/trans_presets.java:2623
+#: build/trans_presets.java:2624
 msgid "Edit Region"
 msgstr "地方の編集"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2628
+#: build/trans_presets.java:2629
 msgid "County"
 msgstr "郡"
 
 #. item
-#: build/trans_presets.java:2629
+#: build/trans_presets.java:2630
 msgid "Edit County"
 msgstr "郡の編集"
@@ -16971,15 +17325,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2635
+#: build/trans_presets.java:2636
 msgid "City"
 msgstr "市区"
 
 #. item
-#: build/trans_presets.java:2636
+#: build/trans_presets.java:2637
 msgid "Edit City"
 msgstr "市区の編集"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2641
+#: build/trans_presets.java:2642
 msgid "Town"
 msgstr "町"
@@ -16987,10 +17341,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 "町の編集"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2649
 msgid "Suburb"
 msgstr "近郊住宅地"
@@ -16998,25 +17352,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 "近郊住宅地の編集"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2656
 msgid "Village"
 msgstr "村"
 
 #. item
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2657
 msgid "Edit Village"
 msgstr "村の編集"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2662
 msgid "Hamlet"
 msgstr "小村落"
 
 #. item
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2663
 msgid "Edit Hamlet"
 msgstr "小村落の編集"
@@ -17024,5 +17378,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2669
 msgid "Locality"
 msgstr "地域"
@@ -17030,10 +17384,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 "地域の編集"
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2676
 msgid "Island"
 msgstr "島"
@@ -17041,5 +17395,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 "島の編集"
@@ -17047,5 +17401,5 @@
 #. item "Places/Island" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2683
+#: build/trans_presets.java:2684
 msgid "Cave Entrance"
 msgstr "洞窟の入口"
@@ -17053,10 +17407,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 "洞窟の入口の編集"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2690
 msgid "Peak"
 msgstr "山頂"
@@ -17064,10 +17418,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 "山頂の編集"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2697
 msgid "Glacier"
 msgstr "氷河"
@@ -17075,10 +17429,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 "氷河の編集"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2703
+#: build/trans_presets.java:2704
 msgid "Volcano"
 msgstr "火山"
@@ -17086,70 +17440,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 "火山の編集"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2711
+#: build/trans_presets.java:2712
 msgid "Boundaries"
 msgstr "境界線"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2713
 msgid "National"
 msgstr "国境"
 
 #. item
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2714
 msgid "Edit National Boundary"
 msgstr "国境の編集"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2718
+#: build/trans_presets.java:2719
 msgid "Administrative"
 msgstr "行政区画"
 
 #. item
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2720
 msgid "Edit Administrative Boundary"
 msgstr "行政区画の編集"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2724
+#: build/trans_presets.java:2725
 msgid "Civil"
 msgstr "Civil境界"
 
 #. item
-#: build/trans_presets.java:2725
+#: build/trans_presets.java:2726
 msgid "Edit Civil Boundary"
 msgstr "Civil境界の編集"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2730
+#: build/trans_presets.java:2731
 msgid "Political"
 msgstr "地点名"
 
 #. item
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:2732
 msgid "Edit Political Boundary"
 msgstr "Political境界の編集"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2736
+#: build/trans_presets.java:2737
 msgid "National park"
 msgstr "国立公園"
 
 #. item
-#: build/trans_presets.java:2737
+#: build/trans_presets.java:2738
 msgid "Edit National Park Boundary"
 msgstr "国立公園の境界編集"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2744
 msgid "Land use"
 msgstr "土地利用"
 
 #. group "Land use"
-#: build/trans_presets.java:2744
+#: build/trans_presets.java:2745
 msgid "Tree"
 msgstr "樹木・林"
@@ -17158,15 +17512,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 "樹木・林の編集"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2753
 msgid "Botanical Name"
 msgstr "植物の名前"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2755
 msgid "Wood"
 msgstr "森"
@@ -17175,5 +17529,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 "森の編集"
@@ -17181,17 +17535,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 "針葉樹"
 
-#: build/trans_presets.java:2760 build/trans_presets.java:2769
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
 msgid "deciduous"
 msgstr "広葉樹"
 
-#: build/trans_presets.java:2760 build/trans_presets.java:2769
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
 msgid "mixed"
 msgstr "混合林"
 
-#: build/trans_presets.java:2762
+#: build/trans_presets.java:2763
 msgid "Forest"
 msgstr "森"
@@ -17200,14 +17554,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 "森の編集"
 
-#: build/trans_presets.java:2771
+#: build/trans_presets.java:2772
 msgid "Nature Reserve"
 msgstr "自然保護区"
 
 #. item
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2773
 msgid "Edit Nature Reserve"
 msgstr "自然保護区の編集"
@@ -17215,25 +17569,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2777
+#: build/trans_presets.java:2778
 msgid "Scree"
 msgstr "ガレ場"
 
 #. item
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:2779
 msgid "Edit Scree"
 msgstr "ガレ場の編集"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2783
 msgid "Scrub"
 msgstr "低木林"
 
 #. item
-#: build/trans_presets.java:2783
+#: build/trans_presets.java:2784
 msgid "Edit Scrub"
 msgstr "低木林の編集"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2788
 msgid "Fell"
 msgstr "山(Fell)"
@@ -17241,10 +17595,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 "山(Fell)の編集"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2794
 msgid "Heath"
 msgstr "荒れ地"
@@ -17252,5 +17606,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 "荒れ地の編集"
@@ -17258,5 +17612,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2801
 msgid "Farmyard"
 msgstr "農家の庭"
@@ -17265,45 +17619,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 "農家の庭の編集"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2808
+#: build/trans_presets.java:2809
 msgid "Farmland"
 msgstr "農地"
 
 #. item
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2810
 msgid "Edit Farmland Landuse"
 msgstr "農地の編集"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2814
+#: build/trans_presets.java:2815
 msgid "Meadow"
 msgstr "牧草地"
 
 #. item
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2816
 msgid "Edit Meadow Landuse"
 msgstr "牧草地の編集"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2820
+#: build/trans_presets.java:2821
 msgid "Vineyard"
 msgstr "ぶどう園"
 
 #. item
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2822
 msgid "Edit Vineyard Landuse"
 msgstr "ぶどう園の土地利用の編集"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2826
+#: build/trans_presets.java:2827
 msgid "Allotments"
 msgstr "貸し農園"
 
 #. item
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:2828
 msgid "Edit Allotments Landuse"
 msgstr "家庭菜園用地の編集"
@@ -17311,25 +17665,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2833
+#: build/trans_presets.java:2834
 msgid "Garden"
 msgstr "庭園"
 
 #. item
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2835
 msgid "Edit Garden"
 msgstr "庭園の編集"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2838
+#: build/trans_presets.java:2839
 msgid "Grass"
 msgstr "草地"
 
 #. item
-#: build/trans_presets.java:2839
+#: build/trans_presets.java:2840
 msgid "Edit Grass Landuse"
 msgstr "草地の編集"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2845
 msgid "Village Green"
 msgstr "里山"
@@ -17337,10 +17691,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 "里山利用区画の編集"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:2852
 msgid "Common"
 msgstr "共有地"
@@ -17348,20 +17702,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 "共有地の名前"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2858
 msgid "Park"
 msgstr "公園"
 
 #. item
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:2859
 msgid "Edit Park"
 msgstr "公園の編集"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2863
 msgid "Recreation Ground"
 msgstr "レクレーション広場"
@@ -17369,5 +17723,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 "レクレーション広場利用区画の編集"
@@ -17375,15 +17729,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2871
 msgid "Residential area"
 msgstr "住宅エリア"
 
 #. item
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2872
 msgid "Edit Residential Landuse"
 msgstr "住宅用地の編集"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2877
 msgid "Graveyard"
 msgstr "墓所"
@@ -17391,9 +17745,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 "（教会・寺院にある）墓所の編集"
 
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:2885
 msgid "Cemetery"
 msgstr "共同墓地"
@@ -17401,39 +17755,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 "共同墓地の編集"
 
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2894
 msgid "Retail"
 msgstr "小売り商業"
 
 #. item
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2895
 msgid "Edit Retail Landuse"
 msgstr "小売商用地の編集"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2900
 msgid "Commercial"
 msgstr "商用"
 
 #. item
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2901
 msgid "Edit Commercial Landuse"
 msgstr "商用地の編集"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2906
 msgid "Industrial"
 msgstr "工業"
 
 #. item
-#: build/trans_presets.java:2906
+#: build/trans_presets.java:2907
 msgid "Edit Industrial Landuse"
 msgstr "工業地の編集"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2912
 msgid "Railway land"
 msgstr "鉄道用地"
@@ -17441,15 +17795,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 "鉄道用地の編集"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:2919
 msgid "Military"
 msgstr "軍用"
 
 #. item
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2920
 msgid "Edit Military Landuse"
 msgstr "軍用地の編集"
@@ -17457,55 +17811,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2925
+#: build/trans_presets.java:2926
 msgid "Construction area"
 msgstr "工事中エリア"
 
 #. item
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2927
 msgid "Edit Construction Landuse"
 msgstr "工事中用地の編集"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2932
 msgid "Brownfield"
 msgstr "利用されなくなった商業設備"
 
 #. item
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:2933
 msgid "Edit Brownfield Landuse"
 msgstr "利用されなくなった工業地の編集"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2937
+#: build/trans_presets.java:2938
 msgid "Greenfield"
 msgstr "未開発工業地"
 
 #. item
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:2939
 msgid "Edit Greenfield Landuse"
 msgstr "緑地の編集"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:2944
 msgid "Landfill"
 msgstr "埋め立てゴミ処理地"
 
 #. item
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:2945
 msgid "Edit Landfill Landuse"
 msgstr "埋め立てゴミ処理地の編集"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2950
 msgid "Quarry"
 msgstr "採石場"
 
 #. item
-#: build/trans_presets.java:2950
+#: build/trans_presets.java:2951
 msgid "Edit Quarry Landuse"
 msgstr "採石場の編集"
 
 #. group "Relations"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2960
 msgid "Multipolygon"
 msgstr "マルチポリゴン"
@@ -17515,5 +17869,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 "マルチポリゴンを編集"
@@ -17522,10 +17876,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:2970
 msgid "outer segment"
 msgstr "外側のセグメント"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:2970
+#: build/trans_presets.java:2971
 msgid "inner segment"
 msgstr "内側のセグメント"
@@ -17533,5 +17887,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:2974
 msgid "Turn restriction"
 msgstr "右左折制限"
@@ -17540,5 +17894,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 "右左折制限の編集"
@@ -17546,34 +17900,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 "通行制限"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_left_turn"
 msgstr "左折禁止"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_right_turn"
 msgstr "右折禁止"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_straight_on"
 msgstr "直進禁止"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_u_turn"
 msgstr "Uターン禁止"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "only_right_turn"
 msgstr "右折のみ"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "only_left_turn"
 msgstr "左折のみ"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "only_straight_on"
 msgstr "直進のみ"
@@ -17582,15 +17936,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2983
+#: build/trans_presets.java:2984
 msgid "from way"
 msgstr "ウエイから"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2985
 msgid "via node or way"
 msgstr "ノードかウェイを経由して"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2986
 msgid "to way"
 msgstr "ウエイへ"
@@ -17598,5 +17952,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:2988
+#: build/trans_presets.java:2989
 msgid "Route"
 msgstr "ルート"
@@ -17605,5 +17959,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 "ルート編集"
@@ -17611,5 +17965,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 "ルート種類"
@@ -17681,5 +18035,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
@@ -17688,17 +18042,17 @@
 msgstr "自転車"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "bus"
 msgstr "バス"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "road"
 msgstr "道"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "ferry"
 msgstr "フェリー"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "ski"
 msgstr "スキー"
@@ -17751,5 +18105,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
@@ -17758,13 +18112,13 @@
 msgstr "徒歩"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "hiking"
 msgstr "ハイキング"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "tram"
 msgstr "トラム"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "detour"
 msgstr "迂回路"
@@ -17778,10 +18132,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 "地下鉄"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:2997
 msgid "Symbol description"
 msgstr "シンボルの説明"
@@ -17789,26 +18143,26 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:2999
+#: build/trans_presets.java:3000
 msgid "Network"
 msgstr "ネットワーク"
 
 #. item "Relations/Route" combo "State"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "proposed"
 msgstr "案"
 
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "temporary"
 msgstr "一時的"
 
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "connection"
 msgstr "接続"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3003
 msgid "Color (hex)"
 msgstr "色 (16進法)"
@@ -17817,30 +18171,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:3006
 msgid "route segment"
 msgstr "ルートセグメント"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3007
 msgid "forward segment"
 msgstr "前のセグメント"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3008
 msgid "backward segment"
 msgstr "後方セグメント"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3009
 msgid "halt point"
 msgstr "停止点"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3010
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3011
 msgid "backward halt point"
 msgstr ""
@@ -21955,7 +22309,19 @@
 msgstr ""
 
+#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
+#~ msgstr "ズームやパンにマウスやCtrl+Arrow キー/./を使います。"
+
 #~ msgid "Uploading data"
 #~ msgstr "アップロードするデータ"
 
+#~ msgid "Email"
+#~ msgstr "Email"
+
+#~ msgid "Login name (email) to the OSM account."
+#~ msgstr "OSMアカウントのログイン名（email)"
+
+#~ msgid "OSM username (email)"
+#~ msgstr "OSMユーザ名（email）"
+
 #~ msgid "Unknown host"
 #~ msgstr "不明なホスト"
@@ -21963,4 +22329,11 @@
 #~ msgid "Add either site-josm.xml or Wiki Pages."
 #~ msgstr "site-josm.xmlかWikiページを追加する。"
+
+#~ msgid ""
+#~ "Server returned internal error. Try a reduced area or retry after waiting "
+#~ "some time."
+#~ msgstr ""
+#~ "サーバが内部エラーを返しました。しばらく待ってから試すか、領域指定を縮小し"
+#~ "て試してください。"
 
 #~ msgid "Commit comment"
@@ -22018,4 +22391,13 @@
 #~ msgid "Really mark this issue as ''done''?"
 #~ msgstr "本当に、この問題を“処理済み”としてマークしますか？"
+
+#~ 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 URL.<br><b>Do not use a valuable Password.</b></html>"
+#~ msgstr ""
+#~ "<html>警告：パスワードは平文で設定ファイルに格納されます。<br>パスワード"
+#~ "は、URLに付加されて平文でサーバに送信されます。<br><b>他で使用しているパス"
+#~ "ワードは使用しないでください。</b></html>"
 
 #~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS"
@@ -22046,4 +22428,7 @@
 #~ msgstr "高架橋"
 
+#~ msgid "Open the OpenStreetBugs window and activate the automatic download"
+#~ msgstr "OpenStreetBugsウインドウを開き、自動ダウンロードを行います。"
+
 #~ msgid "sports"
 #~ msgstr "スポーツ店"
@@ -22051,4 +22436,19 @@
 #~ msgid "Delete and Download"
 #~ msgstr "削除とダウンロード"
+
+#~ msgid ""
+#~ "This action will require {0} individual download requests. Do you wish to "
+#~ "continue?"
+#~ msgstr "この作業は、{0}回のダウンロードを実行します。続けますか？"
+
+#~ msgid ""
+#~ "An error occured while trying to match the photos to the GPX track. You "
+#~ "can adjust the sliders to manually match the photos."
+#~ msgstr ""
+#~ "GPXトラックに写真を合わせようとしているときにエラーが起きました。スライ"
+#~ "ダーを調整して、手動で写真に合わせることができます。"
+
+#~ msgid "The following errors occured during mass download:"
+#~ msgstr "次のエラーは、大量ダウンロードのときに起きました。"
 
 # http://en.wikipedia.org/wiki/Draw_bridge
@@ -22059,4 +22459,16 @@
 #~ msgstr "城の格子戸の編集"
 
+#~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">english</A>."
+#~ msgstr ""
+#~ "ヘルプページがありません。<A HREF=\"{0}\">英語</A>でそれを作成してくださ"
+#~ "い。"
+
+#~ msgid ""
+#~ "Helppage missing. Create it in <A HREF=\"{0}\">english</A> or <A HREF="
+#~ "\"{1}\">your language</A>."
+#~ msgstr ""
+#~ "ヘルプページがありません。<A HREF=\"{0}\">英語</A>もしくは<A HREF=\"{1}\">"
+#~ "あなたの母国語</A>でそれを作成してください。"
+
 #~ msgid "Remove route nodes"
 #~ msgstr "ルートノードの削除"
@@ -22068,4 +22480,7 @@
 #~ msgstr "初期化されていません。"
 
+#~ msgid "Cannot read numeric value from response"
+#~ msgstr "応答から数値を読み取れません。"
+
 #~ msgid "Data upload failed for unknown reason"
 #~ msgstr "不明な理由でデータのアップロードに失敗しました。"
Index: applications/editors/josm/i18n/po/nb.po
===================================================================
--- applications/editors/josm/i18n/po/nb.po	(revision 16008)
+++ applications/editors/josm/i18n/po/nb.po	(revision 16009)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-14 16:51+0200\n"
-"PO-Revision-Date: 2009-06-09 19:18+0000\n"
+"POT-Creation-Date: 2009-06-19 21:52+0200\n"
+"PO-Revision-Date: 2009-06-14 18:00+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-06-14 14:47+0000\n"
+"X-Launchpad-Export-Date: 2009-06-19 19:35+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 "Hjelp"
 
 #: ../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 ""
 
@@ -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"
@@ -530,5 +532,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 "Hjelp mangler. Kan lages i <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 ""
-"Hjelp mangler. Kan lages i <A HREF=\"{0}\">english</A> ellerr <A HREF=\"{1}"
-"\">norsk bokmål</A>."
 
 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:26
@@ -1135,13 +1137,13 @@
 msgstr "Hjelp: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:99
 msgid "Status Report"
 msgstr "Statusrapport"
 
-#: ../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 "Kopier til utklippstavlen og Lukk"
 
-#: ../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
@@ -1334,102 +1336,272 @@
 msgstr "Tøm utvalg (Escape)"
 
-#: ../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 "Oppdater Data"
 
-#: ../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 "Oppdaterer aktuelt data lag fra server (laster ned på nytt)"
 
-#: ../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?"
 msgstr "Ingen data å oppdatere. Har du allerede åpnet eller lastet dette ned?"
 
-#: ../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 "Dette vil kreve {0} runder med download requests. Fortsette?"
-
-#: ../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 "Last opp til OSM..."
 
-#: ../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 "Last opp alle endringer til OSM serveren."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:96
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:94
 msgid "Objects to add:"
 msgstr "Objekter som legges til:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102
 msgid "Objects to modify:"
 msgstr "Objekter som endres:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:110
 msgid "Objects to delete:"
 msgstr "Objekter som slettes:"
 
-#: ../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 "Gi en kort kommentar for endringene du laster opp:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:126
 msgid "Upload these changes?"
 msgstr "Laste opp disse endringene?"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:130
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
 msgid "Upload Changes"
 msgstr "Last opp endringer"
 
-#: ../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 "Ingen endringer å laste opp. Finn frem data først."
 
-#: ../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 "Data inneholder uløste konflikter som først må løses."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:182
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:180
 msgid "No changes to upload."
 msgstr "Ingen endringer å laste opp."
 
-#: ../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 ""
@@ -1534,37 +1706,51 @@
 msgstr "GPS rådata"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:44
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:46
 msgid "Downloading data"
 msgstr "Last ned data"
 
-#: ../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 "Ingenting er importert."
 
-#: ../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 "Data Lag {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 "OpenStreetMap data"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:37
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:45
 msgid "Data Layer"
 msgstr "Data Lag"
 
-#: ../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 "Last ned {0} av {1} ({2} gjenstår)"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:88
-msgid "The following errors occured during mass download:"
-msgstr "Følgende feil oppsto under nedlasting:"
-
-#: ../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 "Feil under nedlasting:"
+
+#: ../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
@@ -1617,34 +1803,34 @@
 msgstr "Kan ikke velge Node fra verdensrommet."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:495
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:493
 msgid "Add node"
 msgstr "Legg til node"
 
-#: ../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 "Legg til Node i linje"
 
-#: ../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 "Knytt eksisterende linje til Node"
 
-#: ../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 "Legg til en Node i eksisterende linje"
 
-#: ../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 "Legg til Node i linje og lag tilknytning"
 
-#: ../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 "Lag ny Node"
 
-#: ../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 "Veg Node ved markøren."
 
-#: ../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."
@@ -1653,14 +1839,14 @@
 msgstr[1] "Sett inn ny Node i {0} linjer."
 
-#: ../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 "Start ny linje fra siste Node."
 
-#: ../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 "Fortsett samme linje fra siste Node."
 
-#: ../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 "Avslutt tegning."
@@ -1982,26 +2168,32 @@
 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 "Les inn utvalg"
 
-#: ../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 "Koble til {0}..."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:45
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:46
 msgid "Downloading..."
 msgstr "Laster ned..."
 
-#: ../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 "Kunne ikke lese fra URL: \"{0}\""
 
-#: ../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 "Feil ved sending til URL: \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:74
+msgid "Error while communicating with server."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67
@@ -2062,13 +2254,85 @@
 msgstr "{0} konflikter må løses i {1} objecter"
 
-#: ../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 "Slett {1} {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97
+#, java-format
+msgid "Delete {0} {1}"
+msgstr "Slett {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153
+msgid "Conflicting relation"
+msgstr "Relasjonen har konflikter"
+
+#: ../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 ""
+"Utvalg \"{0}\" er brukr i relasjon \"{1}\" med rolle {2}.\n"
+"Slett fra relasjon?"
+
+#: ../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 "Slett fra relasjon"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
+#, java-format
+msgid ""
+"Selection \"{0}\" is used by relation \"{1}\".\n"
+"Delete from relation?"
+msgstr ""
+"Utvalg \"{0}\" er brukt u relasjon \"{1}\".\n"
+"Slett fra relasjon?"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:366
+msgid "Split way segment"
+msgstr "Splitt linje i segment"
+
+#. 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 ""
+"Du er i ferd med å slette Noder utenfor nedlastet område.<br>Dette kan skape "
+"problem fordi de kan være i bruk av andre objekt (som du ikke kan se nå) ."
+"<br>Er du sikker på at du vil slette?"
+
+#: ../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 "Flytt"
+
 #: ../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"
@@ -2077,10 +2341,219 @@
 msgstr[1] "Node"
 
-#: ../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 "Fjern medlem i relasjon"
+
+#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
+msgid "Rotate"
+msgstr "Roter"
+
+#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88
+msgid "Sequence"
+msgstr "Sekvens"
+
+#: ../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 "Gjennomfør?"
+
+#: ../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 ""
+"Når du snur rening på linje blir følgende egenskaper endret for å "
+"opprettholde dataintegritet."
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28
+msgid "Relation"
+msgstr "Relasjon"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30
+msgid "Old role"
+msgstr "Eks rolle"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:32
+msgid "New role"
+msgstr "Ny rolle"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
+msgid "Old key"
+msgstr "Eks nøkkel"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
+msgid "Old value"
+msgstr "Eks verdi"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
+msgid "New key"
+msgstr "Ny nøkkel"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
+msgid "New value"
+msgstr "Ny verdi"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:40
+msgid "Apply selected changes"
+msgstr "Bruk valgte endringer"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41
+msgid "Don't apply changes"
+msgstr "Ikke bruk endringer"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:83
+msgid "Please select which property changes you want to apply."
+msgstr "Velg hvilke endringer som skal brukes."
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:96
+msgid "Properties of "
+msgstr "Egenskaper for "
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:120
+msgid "Roles in relations referring to"
+msgstr "Roller i relasjon viser til"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:136
+msgid "Automatic tag correction"
+msgstr "Korriger egenskap automatisk"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:314
+#, java-format
+msgid "Malformed config file at lines {0}"
+msgstr "Config file har feil i linje {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:324
+#, java-format
+msgid "Cannot open preferences directory: {0}"
+msgstr "Kan ikke åpne oppsett: {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 "Feil i oppsett fila. Backup lagres i {0}."
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:79
+#, java-format
+msgid "Preferences stored on {0}"
+msgstr "Oppsett lagret i {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:82
+#, java-format
+msgid "Could not upload preferences. Reason: {0}"
+msgstr "Kunne ikke laste opp oppsett. Årsak: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:93
+msgid "Could not load preferences from server."
+msgstr "Kan ikke lese oppsett fra server."
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:34
+msgid "different"
+msgstr "forskjellig"
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:262
+msgid "deleted"
+msgstr "slettet"
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
+msgid "true"
+msgstr "sann"
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
+msgid "false"
+msgstr "usann"
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20
+msgid "position"
+msgstr "posisjon"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30
+msgid "Decimal Degrees"
+msgstr "Desimalgrader"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
+msgid "Degrees Minutes Seconds"
+msgstr "Grader Minutt Sekunder"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+msgid "S"
+msgstr "S"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+msgid "N"
+msgstr "N"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+msgid "W"
+msgstr "V"
+
+#: ../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 "uferdig"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
+#, java-format
+msgid "Error: {0}"
+msgstr "Feil: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
+#, java-format
+msgid "Warning: {0}"
+msgstr "Advarsel: {0}"
+
+#: ../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"
@@ -2089,8 +2562,10 @@
 msgstr[1] "linjer"
 
-#: ../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
@@ -2101,265 +2576,27 @@
 msgstr[1] "Relasjoner"
 
-#: ../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 "Slett {1} {0}"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97
-#, java-format
-msgid "Delete {0} {1}"
-msgstr "Slett {0} {1}"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153
-msgid "Conflicting relation"
-msgstr "Relasjonen har konflikter"
-
-#: ../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 ""
-"Utvalg \"{0}\" er brukr i relasjon \"{1}\" med rolle {2}.\n"
-"Slett fra relasjon?"
-
-#: ../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 "Slett fra relasjon"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
-#, java-format
-msgid ""
-"Selection \"{0}\" is used by relation \"{1}\".\n"
-"Delete from relation?"
-msgstr ""
-"Utvalg \"{0}\" er brukt u relasjon \"{1}\".\n"
-"Slett fra relasjon?"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:366
-msgid "Split way segment"
-msgstr "Splitt linje i segment"
-
-#. 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 ""
-"Du er i ferd med å slette Noder utenfor nedlastet område.<br>Dette kan skape "
-"problem fordi de kan være i bruk av andre objekt (som du ikke kan se nå) ."
-"<br>Er du sikker på at du vil slette?"
-
-#: ../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 "Flytt"
-
-#: ../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 "Fjern medlem i relasjon"
-
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
-msgid "Rotate"
-msgstr "Roter"
-
-#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88
-msgid "Sequence"
-msgstr "Sekvens"
-
-#: ../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 "Gjennomfør?"
-
-#: ../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 ""
-"Når du snur rening på linje blir følgende egenskaper endret for å "
-"opprettholde dataintegritet."
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28
-msgid "Relation"
-msgstr "Relasjon"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30
-msgid "Old role"
-msgstr "Eks rolle"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:32
-msgid "New role"
-msgstr "Ny rolle"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
-msgid "Old key"
-msgstr "Eks nøkkel"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
-msgid "Old value"
-msgstr "Eks verdi"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
-msgid "New key"
-msgstr "Ny nøkkel"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
-msgid "New value"
-msgstr "Ny verdi"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:40
-msgid "Apply selected changes"
-msgstr "Bruk valgte endringer"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41
-msgid "Don't apply changes"
-msgstr "Ikke bruk endringer"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:83
-msgid "Please select which property changes you want to apply."
-msgstr "Velg hvilke endringer som skal brukes."
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:96
-msgid "Properties of "
-msgstr "Egenskaper for "
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:120
-msgid "Roles in relations referring to"
-msgstr "Roller i relasjon viser til"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:136
-msgid "Automatic tag correction"
-msgstr "Korriger egenskap automatisk"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:314
-#, java-format
-msgid "Malformed config file at lines {0}"
-msgstr "Config file har feil i linje {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:324
-#, java-format
-msgid "Cannot open preferences directory: {0}"
-msgstr "Kan ikke åpne oppsett: {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 "Feil i oppsett fila. Backup lagres i {0}."
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:79
-#, java-format
-msgid "Preferences stored on {0}"
-msgstr "Oppsett lagret i {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:82
-#, java-format
-msgid "Could not upload preferences. Reason: {0}"
-msgstr "Kunne ikke laste opp oppsett. Årsak: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:93
-msgid "Could not load preferences from server."
-msgstr "Kan ikke lese oppsett fra server."
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:34
-msgid "different"
-msgstr "forskjellig"
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:262
-msgid "deleted"
-msgstr "slettet"
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
-msgid "true"
-msgstr "sann"
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
-msgid "false"
-msgstr "usann"
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20
-msgid "position"
-msgstr "posisjon"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30
-msgid "Decimal Degrees"
-msgstr "Desimalgrader"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
-msgid "Degrees Minutes Seconds"
-msgstr "Grader Minutt Sekunder"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
-msgid "S"
-msgstr "S"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
-msgid "N"
-msgstr "N"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
-msgid "W"
-msgstr "V"
-
-#: ../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 "uferdig"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
-#, java-format
-msgid "Error: {0}"
-msgstr "Feil: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
-#, java-format
-msgid "Warning: {0}"
-msgstr "Advarsel: {0}"
-
-#: ../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"
@@ -2373,5 +2610,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:122
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "railway"
 msgstr "jernbane"
@@ -2393,4 +2630,62 @@
 msgstr[1] "{0} Noder"
 
+#: ../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."
@@ -2538,5 +2833,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 "bakgrunn"
@@ -2625,8 +2920,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
@@ -2638,7 +2933,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
@@ -2745,10 +3040,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 "Brukernavn"
 
 #: ../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 "Passord"
@@ -2844,22 +3139,22 @@
 msgstr "Innstilligen  {0} er fjernet fordi den ikke lenger brukes."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:146
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148
 msgid "File"
 msgstr "Fil"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150
 msgid "View"
 msgstr "Vis"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:149
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151
 msgid "Tools"
 msgstr "Verktøy"
 
-#: ../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 "Objektmaler"
 
-#: ../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
@@ -2872,21 +3167,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 "Vis akselinjer"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:218
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221
 msgid "Toggle Wireframe view"
 msgstr "Slå av/på akselinjer"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:244
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:247
 msgid "Full Screen"
 msgstr "Fullskjerm"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:246
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:249
 msgid "Toggle Full Screen view"
 msgstr "Slå av/på fullskjerm"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:286
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:289
 msgid "Audio"
 msgstr "Audio"
@@ -2958,6 +3253,6 @@
 msgstr "(inget objekt)"
 
-#: ../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 "Layer er ikke i lista."
@@ -2967,9 +3262,9 @@
 msgstr "Kontacter OSM server..."
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:104
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:105
 msgid "Error while parsing"
 msgstr "Feil ved oversendelse"
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:107
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:108
 msgid "File not found"
 msgstr "Fil ikke funnet"
@@ -3042,5 +3337,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 "Medlemmer"
@@ -3236,5 +3531,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
@@ -3316,5 +3611,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 ""
@@ -3353,5 +3648,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 ""
 
@@ -3405,5 +3700,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 "Rolle"
@@ -3507,5 +3802,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
@@ -3815,5 +4110,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 "Relasjoner"
@@ -3918,66 +4213,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 "Utfør endringer"
 
-#: ../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 "Enkel"
 
-#: ../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 "Brukt av"
 
-#: ../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 "koblet"
 
-#: ../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 "Egenskaper (tom verdi fjerner egenskap)"
 
-#: ../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 "Flytt opp"
 
-#: ../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 "Flytt valgte medlem opp"
 
-#: ../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 "Legg til utvalgte"
 
-#: ../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 "Tilføy alle valgte objekt som medlemmer"
 
-#: ../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 "Fjern Utvalg"
 
-#: ../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 "Fjern alle valgte objekt fra relasjon"
 
-#: ../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 "Flytt ned"
 
-#: ../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 "Flytt valgt medlem ned"
 
-#: ../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 "Fjern medlemmet i aktiv tabelrekke fra denne relasjonen"
 
-#: ../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 "Last ned medlemmer"
 
-#: ../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 "Last ned alle ufullstændige linjer og noder i relasjonen"
@@ -4022,5 +4317,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
@@ -4041,9 +4336,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 "ja"
 
-#: ../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
@@ -4065,31 +4360,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 "nei"
 
-#: ../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 "Medlemmer: {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 "Relasjons-editor: {0}"
 
-#: ../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 "Det var konflikter ved import."
 
-#: ../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 "Feil i oversendelse av server respons."
 
-#: ../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 "Kan ikke koble til serveren."
+
+#: ../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
@@ -4155,17 +4453,17 @@
 msgstr "Datakilder og typer"
 
-#: ../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 "Last ned som nytt lag"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:174
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:173
 msgid "Download Area"
 msgstr "Last ned område"
 
-#: ../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 "Området er for stort; vil sandsynligvis bli avvist av server"
 
-#: ../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 ""
@@ -4194,5 +4492,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 "Steder"
@@ -4239,21 +4537,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 "type"
@@ -4293,14 +4591,4 @@
 msgid "Tile Numbers"
 msgstr "Flis-nummer"
-
-#: ../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 "Du kan bruke mus eller Ctrl+piltaster/./ for å zoome og panorere."
-
-#. 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 "Kart"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:98
@@ -4379,5 +4667,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)"
@@ -4493,14 +4781,14 @@
 msgstr "Wave-lydfiler (*.wav)"
 
-#: ../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 "Lyd-markører fra {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244
 msgid "Import images"
 msgstr "Importer bilder"
 
-#: ../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, "
@@ -4509,5 +4797,5 @@
 msgstr[1] "{0} spor, "
 
-#: ../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, "
@@ -4516,5 +4804,5 @@
 msgstr[1] "{0} ruter, "
 
-#: ../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"
@@ -4523,28 +4811,28 @@
 msgstr[1] "{0} waypoints"
 
-#: ../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 "Navn: {0}"
 
-#: ../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 "Beskrivelse: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347
 msgid "Timespan: "
 msgstr "Tidshorisont: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354
 msgid "Length: "
 msgstr "Lengde: "
 
-#: ../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 "Konverter til datalag"
 
-#: ../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 ""
@@ -4555,11 +4843,11 @@
 "skadeligt <br>Se her for å laste inn GPS spor:"
 
-#: ../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
@@ -4569,29 +4857,29 @@
 msgstr "Konvertert fra: {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 "Last ned fra OSM langs dette spor"
 
-#: ../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 "Last ned alt innenfor:"
 
-#: ../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 "{0} meter"
 
-#: ../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 "Max areal per forespørsel:"
 
-#: ../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 "{0} km²"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:822
 #, java-format
 msgid ""
@@ -4602,9 +4890,9 @@
 "Ønsker du<br>å fortsette?</html>"
 
-#: ../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 "Ingen GPX-spor er tilgængelige i laget som kan assosieres med lyd."
 
-#: ../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 "
@@ -4614,5 +4902,5 @@
 "ble utelatt eller flyttet til start."
 
-#: ../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 "
@@ -4622,33 +4910,42 @@
 "utelatt."
 
-#: ../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 "utenfor nedlastet område"
 
-#: ../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 "versjon {0}"
 
-#: ../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 "{0} består av:"
 
-#: ../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} slettet.)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:371
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:396
 msgid "unset"
 msgstr "ikke satt"
 
-#: ../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 "API versjon: {0}"
 
-#: ../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"
@@ -4656,21 +4953,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"
@@ -4818,5 +5115,5 @@
 "enda)"
 
-#: ../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
@@ -4825,5 +5122,5 @@
 msgstr "Velg raden som skal endres"
 
-#: ../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
@@ -4831,5 +5128,5 @@
 msgstr "Ny verdi for {0}"
 
-#: ../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
@@ -4839,5 +5136,5 @@
 msgstr "Velg raden som skal slettes"
 
-#: ../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 "Gi en ny nøkkel med verdi"
@@ -5726,106 +6023,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 "Navn"
@@ -6300,6 +6597,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:36
-msgid "Login name (email) to the OSM account."
-msgstr "Innloggings navnet (e-postadresse) til OSM kontoen."
+msgid "Login name (e-mail) to the OSM account."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
@@ -6315,6 +6612,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
-msgid "OSM username (email)"
-msgstr "OSM brukernavn (e-postadressen)"
+msgid "OSM username (e-mail)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
@@ -6325,11 +6622,7 @@
 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 ""
-"<html>ADVARSEL: Passordet er lagret i vanlig tekst (IKKE KRYPTERT) i "
-"konfigurasjons filen.<br>Passordet er overført i vanlig tekst til serveren, "
-"satt inn i web adressen.<br><b>Ikke bruk et viktig passord da andre kan lese "
-"det.</b></html>"
 
 #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on
@@ -6643,6 +6936,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 "Kontakter OSM-serveren..."
@@ -6653,7 +6947,7 @@
 msgstr "Henter punkt {0} til {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 "Laster ned OSM data..."
@@ -6718,15 +7012,14 @@
 msgstr "Feil ved import av NMEA data!"
 
-#: ../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 "Denne versjon av JOSM kan ikke lese fra serveren."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:207
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172
 #, java-format
 msgid ""
@@ -6736,31 +7029,37 @@
 "Den støtter protocol versjon 0.5 og 0.6, men serveren støtter {0} til {1}."
 
-#: ../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 "Kommunikasjon er opprettet med {0} med protocol versjon {1}"
 
-#: ../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 "Finner ikke tallverdi i svaret"
-
-#: ../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 "Åpner basen med rettinger.."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:351
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298
 msgid "Closing changeset..."
 msgstr "Lukker basen med rettinger..."
 
-#: ../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 "Ingen base med rettinger tilstede for opplasting"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:376
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:321
 msgid "Preparing..."
 msgstr "Forbereder..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:381
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:326
 msgid "Uploading..."
 msgstr "Laster opp..."
@@ -6775,25 +7074,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 "Feil passord eller brukernavn."
 
-#: ../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 "Advarsel: Passordet overføres ukryptert."
 
-#: ../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 "Lagre bruker og passord (ukryptert)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:89
 msgid "Enter Password"
 msgstr "Skriv inn passord"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
 msgid "Login"
 msgstr "Logg inn"
 
-#: ../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..."
@@ -6804,4 +7103,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."
@@ -6894,9 +7236,23 @@
 msgstr "Feil id for node"
 
-#: ../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 "Kobler opp Server..."
 
-#: ../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."
@@ -6905,17 +7261,9 @@
 "din."
 
-#: ../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 ""
-"Intern feil i Server. Prøv med et mindre område eller vent litt før du "
-"prøver på nytt."
-
-#: ../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 ""
 
@@ -6931,5 +7279,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 "Last ned Programtillegg"
@@ -7118,9 +7466,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 "Last ned programtillegg som mangler"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:128
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:119
 #, java-format
 msgid ""
@@ -7133,6 +7481,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
@@ -7155,35 +7503,35 @@
 msgstr "ukjent"
 
-#: ../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}: Versjon {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 "Programtillegg inkludert i JOSM"
 
-#: ../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 "Feil oppsto ved lesing av info om programtillegg: {0}"
 
-#: ../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 "Dette er etter avsluttingen av opptaket"
 
-#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:329
+#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:340
 msgid "Error playing sound"
 msgstr "Feil med avspilling av lyd"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
 msgid "Do nothing"
 msgstr "Ikke gjør noe"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
 msgid "Report Bug"
 msgstr "Rapporter feil"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:52
 msgid ""
 "An unexpected exception occurred.\n"
@@ -7197,14 +7545,14 @@
 "versjon av JOSM, setter vi pris på en feilrapport."
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55
 msgid "Unexpected Exception"
 msgstr "En uventet unntakstilstand"
 
-#: ../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 "Venligst send en feilrapport på {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 ""
@@ -7213,5 +7561,5 @@
 "Vær detaljert. Bruk engelsk."
 
-#: ../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 "
@@ -7221,9 +7569,9 @@
 "sender feilrapport."
 
-#: ../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 "Husk å inkludere følgende informasjon:"
 
-#: ../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 "(Teksten har alt blitt kopiert til utklippstavlen din.)"
@@ -7311,5 +7659,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 "Beskrivelse"
@@ -7689,9 +8037,7 @@
 #: ../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 ""
-"Feil ved kobling av foto til GPX spor. Still inn rullefeltet for manuell "
-"kobling."
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:853
@@ -7723,5 +8069,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"
@@ -7744,5 +8089,5 @@
 msgstr "Lambert Zone 4 cache file (.4)"
 
-#: ../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
@@ -7837,6 +8182,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/"
@@ -7923,6 +8268,6 @@
 msgstr "Legg inn kilde ( source=...) på element?"
 
-#: ../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
@@ -7930,11 +8275,11 @@
 msgstr "Laster ned {0}"
 
-#: ../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 "Kobler opp WMS Server..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:157
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:158
 msgid "Create buildings"
 msgstr "Lag bygninger"
@@ -7953,13 +8298,13 @@
 msgstr "Vennligst aktiviser \"auto-sourcing\" og sjekk Cadastre millesime."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:61
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:62
 msgid "Extract SVG ViewBox..."
 msgstr "Lag SVG ViewBox..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:65
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:66
 msgid "Extract best fitting boundary..."
 msgstr "Søk etter best passende avgrensing..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:126
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:127
 msgid "Create boundary"
 msgstr "Lag avgrensing"
@@ -7980,5 +8325,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 "Last ned bilder fra fransk Cadastre WMS"
 
@@ -8075,5 +8420,5 @@
 "Velg ett og prøv på nytt"
 
-#: ../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
@@ -8081,59 +8426,28 @@
 msgstr "Blank ut lag"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:176
 #, java-format
 msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr "WMS lag ({0}), {1} kartutsnitt er lastet"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:183
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:178
 msgid "Is not vectorized."
 msgstr "Er ikke vektorisert"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:179
 #, java-format
 msgid "Raster center: {0}"
 msgstr "Raster midtpunkt: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181
 msgid "Is vectorized."
 msgstr "Er vektorisert"
 
-#: ../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 "Kommune avgrensing: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:282
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
-msgid "Save WMS layer to file"
-msgstr "Lagre WMS lag til fil"
-
-#: ../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 "les inn WMS lag fra fil"
-
-#: ../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 "Støtter ikke WMS fil versjon;fant {0}, ønsker {1}"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:325
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:335
-msgid "File Format Error"
-msgstr "Feil Fil Format"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:481
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:401
 #, java-format
 msgid ""
@@ -8144,15 +8458,14 @@
 "Create a new one."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:482
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402
 msgid "Cache Format Error"
 msgstr "Feil i mellomlager format"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:497
-#, java-format
-msgid "Lambert zone {0} in cache  incompatible with current Lambert zone {1}"
-msgstr ""
-"Lambert sone {0} i mellomlager  stemmer ikke med aktiv Lambert sone {1}"
-
-#: ../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 "Feil Lambert sone på mellomlager"
@@ -8247,11 +8560,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 "Importer spor fra GPX lag"
 
 #: ../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 "Slett eksisterende sti"
@@ -8261,5 +8574,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 "Fant ikke GPX lag"
@@ -8550,4 +8863,8 @@
 msgid "Lakewalker trace"
 msgstr "Lakewalker tegning"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:10
+msgid "An unknown error has occurred"
+msgstr ""
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
@@ -8868,42 +9185,42 @@
 msgstr "LiveGPS"
 
-#: ../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 "Måleverdier"
 
-#: ../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 "Åpne vindu med måleverdier"
 
-#: ../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 "Reset"
 
-#: ../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 "Nullstill måleresultat og slett målesti."
 
-#: ../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 "Lengde på Sti"
 
-#: ../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 "Utvalg Lengde"
 
-#: ../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 "Utvalg Areal"
 
-#: ../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 "Vinkel"
 
-#: ../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 "Vinkel mellom to valgte Noder"
 
-#: ../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 "Målelag"
@@ -8962,6 +9279,6 @@
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
-msgid "Open the OpenStreetBugs window and activate the automatic download"
-msgstr "Åpne vindu med OpenStreetBugs og aktiviser automatisk nedlasting"
+msgid "Opens the OpenStreetBugs window and activates the automatic download"
+msgstr ""
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:123
@@ -9040,5 +9357,5 @@
 msgstr "Osmarender"
 
-#: ../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 "
@@ -9047,9 +9364,9 @@
 "Fant ikke Firefox. Oppgi Firefox-programmet i siden for Kartinnstillinger."
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:123
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:127
 msgid "osmarender options"
 msgstr "osmarender-indstillinger"
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:124
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:128
 msgid "Firefox executable"
 msgstr "Firefox-programfil"
@@ -9483,5 +9800,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 "Gatenavn"
@@ -9574,6 +9891,6 @@
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:195
-msgid "No intersections found. Nothing was changed."
-msgstr "Ingen skjæringspunkt funnet. Ingen endringer utført."
+msgid "No intersection found. Nothing was changed."
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:217
@@ -10449,40 +10766,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 ""
-"Du kan legge til, endre eller slette WMS kilder i WMSplugin Innstillinger - "
-"disse vil vises i WMS menyen.\n"
-"Kan også settes manuelt i Avanserte innstillinger, etter følgende mal:\n"
-"wmsplugin.url.1.name=Landsat\n"
-"wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n"
-"wmsplugin.url.2.name=NPE Maps... osv\n"
-"\n"
-"Full WMS URL input format eksempel (landsat)\n"
-"http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n"
-"layers=global_mosaic&styles=&srs=EPSG:4326&\n"
-"format=image/jpeg \n"
-"\n"
-"For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , må du "
-"bare oppgi gyldig 'id'.\n"
-"Å legge inn  Metacarta Map Rectifier menyer, lag en URL manuelt som i dette "
-"eksempelet. Bytt ut  73 med din bilde 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"
-"OBS:  Sjekk at bildet er egnet med hensyn til kopibeskyttelse. Er du i tvil: "
-"la være å bruke bildet."
-
-#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:54
+
+#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:53
 msgid "WMS Plugin Help"
 msgstr "Hjelp WMS tilleggsprogram"
@@ -10541,5 +10836,5 @@
 msgstr "Tilpass posisjon på valgt  WMS lag"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113
 #, java-format
 msgid ""
@@ -10584,4 +10879,29 @@
 msgid "Alpha channel"
 msgstr "Alpha channel"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
+msgid "Save WMS layer to file"
+msgstr "Lagre WMS lag til fil"
+
+#: ../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 "les inn WMS lag fra fil"
+
+#: ../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 "Støtter ikke WMS fil versjon;fant {0}, ønsker {1}"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:335
+msgid "File Format Error"
+msgstr "Feil Fil Format"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:163
@@ -10676,4 +10996,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 "Dine redigeringer må være offentlig frigitt for å laste opp nye data"
@@ -10690,5 +11015,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 ""
 "Ein spezielles Plugin für die WMS-Server der französischen Landesvermessung."
@@ -11002,5 +11327,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 "Vei Nr"
@@ -11502,5 +11827,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 "Bredde ( meter)"
@@ -11969,7 +12294,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 "Type"
@@ -12585,10 +12910,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 "Driver"
@@ -12800,7 +13125,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 "H.O.H."
@@ -13732,5 +14057,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 "Gebyr"
@@ -13866,5 +14191,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 "Ref (spor nr)"
@@ -13872,5 +14197,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 "Område"
@@ -13922,11 +14247,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 "Ly for Natten"
+
+#. item "Public Transport/Bus Stop" check "Shelter"
 #. </optional>
-#: build/trans_presets.java:1503
+#: build/trans_presets.java:1504
 msgid "Bus Platform"
 msgstr "Buss Platform"
 
 #. item
-#: build/trans_presets.java:1504
+#: build/trans_presets.java:1505
 msgid "Edit Bus Platform"
 msgstr "Rediger Buss Platform"
@@ -13934,5 +14269,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1512
+#: build/trans_presets.java:1513
 msgid "Taxi"
 msgstr "Taxi"
@@ -13940,5 +14275,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 "Rediger Taxi stasjon"
@@ -13946,5 +14281,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1519
+#: build/trans_presets.java:1520
 msgid "Airport"
 msgstr "Flyplass"
@@ -13952,15 +14287,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 "Rediger Flyplass"
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1526
+#: build/trans_presets.java:1527
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1527
+#: build/trans_presets.java:1528
 msgid "ICAO"
 msgstr "ICAO"
@@ -13969,5 +14304,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1532
+#: build/trans_presets.java:1533
 msgid "Accomodation"
 msgstr "Overnatting"
@@ -13979,5 +14314,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 "Hotell"
@@ -13986,15 +14321,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 "Rediger Hotell"
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1539
+#: build/trans_presets.java:1540
 msgid "Stars"
 msgstr "Stjerner"
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1541
+#: build/trans_presets.java:1542
 msgid "Motel"
 msgstr "Motell"
@@ -14002,20 +14337,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 "Rediger Motell"
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1547
+#: build/trans_presets.java:1548
 msgid "Guest House"
 msgstr "Gjestehus"
 
 #. item
-#: build/trans_presets.java:1548
+#: build/trans_presets.java:1549
 msgid "Edit Guest House"
 msgstr "Rediger Gjestehus"
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1552
+#: build/trans_presets.java:1553
 msgid "Chalet"
 msgstr "Feriehytter"
@@ -14023,10 +14358,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 "Rediger Feriehytter"
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1558
+#: build/trans_presets.java:1559
 msgid "Hostel"
 msgstr "Ungdomsherberge"
@@ -14034,30 +14369,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 "Rediger Ungdomsherberge"
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1564
+#: build/trans_presets.java:1565
 msgid "Alpine Hut"
 msgstr "Fjellstue"
 
 #. item
-#: build/trans_presets.java:1565
+#: build/trans_presets.java:1566
 msgid "Edit Alpine Hut"
 msgstr "Rediger Fjellstue"
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1570
+#: build/trans_presets.java:1571
 msgid "Caravan Site"
 msgstr "Caravan Plass"
 
 #. item
-#: build/trans_presets.java:1571
+#: build/trans_presets.java:1572
 msgid "Edit Caravan Site"
 msgstr "Rediger Caravan Plass"
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1575
+#: build/trans_presets.java:1576
 msgid "Camping Site"
 msgstr "Campingplass"
@@ -14065,10 +14400,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 "Rediger Campingplass"
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1582
+#: build/trans_presets.java:1583
 msgid "Food+Drinks"
 msgstr "Mat & Drikke"
@@ -14079,5 +14414,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 "Restaurant"
@@ -14085,5 +14420,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 "Rediger Restaurant"
@@ -14091,5 +14426,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 "Kjøkken"
@@ -14097,61 +14432,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 "italiensk"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "chinese"
 msgstr "kinesisk"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "burger"
 msgstr "gatekjøkken"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "greek"
 msgstr "gresk"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "german"
 msgstr "tysk"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "indian"
 msgstr "indisk"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "regional"
 msgstr "lokal"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "turkish"
 msgstr "tyrkisk"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "asian"
 msgstr "asiatisk"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "thai"
 msgstr "thai"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "mexican"
 msgstr "meksikansk"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "japanese"
 msgstr "japansk"
 
-#: build/trans_presets.java:1590
+#: build/trans_presets.java:1591
 msgid "Fast Food"
 msgstr "Gatekjøkken"
@@ -14159,9 +14494,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 "Rediger Gatekjøkken"
 
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1598
 msgid "Cafe"
 msgstr "Kafe"
@@ -14169,10 +14504,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 "Rediger Kafe"
 
 #. item "Food+Drinks/Cafe" text "Name"
-#: build/trans_presets.java:1603
+#: build/trans_presets.java:1604
 msgid "Pub"
 msgstr "Pub"
@@ -14180,20 +14515,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 "Rediger Pub"
 
 #. item "Food+Drinks/Pub" text "Name"
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1610
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item
-#: build/trans_presets.java:1610
+#: build/trans_presets.java:1611
 msgid "Edit Biergarten"
 msgstr "Rediger Biergarten"
 
 #. item "Food+Drinks/Biergarten" text "Name"
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1615
 msgid "Bar"
 msgstr "Bar"
@@ -14201,10 +14536,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 "Rediger Bar"
 
 #. item "Food+Drinks/Bar" text "Name"
-#: build/trans_presets.java:1620
+#: build/trans_presets.java:1621
 msgid "Nightclub"
 msgstr "Nattklubb"
@@ -14212,20 +14547,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 "Rediger Nattklubb"
 
 #. item "Food+Drinks/Nightclub" text "Name"
-#: build/trans_presets.java:1627
+#: build/trans_presets.java:1628
 msgid "Tourism"
 msgstr "Turisme"
 
 #. group "Tourism"
-#: build/trans_presets.java:1628
+#: build/trans_presets.java:1629
 msgid "Attraction"
 msgstr "Attraksjon"
 
 #. item
-#: build/trans_presets.java:1629
+#: build/trans_presets.java:1630
 msgid "Edit Attraction"
 msgstr "Rediger Attraksjon"
@@ -14234,11 +14569,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 "Åpningstid"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1634
+#: build/trans_presets.java:1635
 msgid "Museum"
 msgstr "Museum"
@@ -14246,10 +14581,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 "Rediger  Museum"
 
 #. item "Tourism/Museum" text "Name"
-#: build/trans_presets.java:1640
+#: build/trans_presets.java:1641
 msgid "Zoo"
 msgstr "Zoologisk hage"
@@ -14258,10 +14593,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 "Rediger  Zoologisk hage"
 
 #. item "Tourism/Zoo" text "Name"
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1648
 msgid "Viewpoint"
 msgstr "Utsiktspunkt"
@@ -14269,25 +14604,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 "Rediger Utsiktspunkt"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1652
+#: build/trans_presets.java:1653
 msgid "Look-Out Tower"
 msgstr "Utsiktstårn"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1654
+#: build/trans_presets.java:1655
 msgid "Theme Park"
 msgstr "Temapark"
 
 #. item
-#: build/trans_presets.java:1655
+#: build/trans_presets.java:1656
 msgid "Edit Theme Park"
 msgstr "Rediger Temapark"
 
 #. item "Tourism/Theme Park" text "Name"
-#: build/trans_presets.java:1659
+#: build/trans_presets.java:1660
 msgid "Artwork"
 msgstr "Kunstutstilling"
@@ -14295,5 +14630,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 "Rediger Kunstutstilling"
@@ -14301,5 +14636,5 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1667
 msgid "Information Office"
 msgstr "Informasjonskontor"
@@ -14307,83 +14642,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 "Rediger Turistinformasjon"
 
+#. item "Tourism/Information Office" text "Opening Hours"
+#: build/trans_presets.java:1675
+msgid "Map"
+msgstr "Kart"
+
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1679
 msgid "Map Type"
 msgstr "Karttype"
 
 #. item "Tourism/Map" combo "Map Type"
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1679
 msgid "map"
 msgstr "kart"
 
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1679
 msgid "citymap"
 msgstr "bykart"
 
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1679
 msgid "hikingmap"
 msgstr "turkart"
 
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1679
 msgid "bicyclemap"
 msgstr "sykkelkart"
 
 #. 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 "Nærmere forklaring"
 
 #. item "Tourism/Map" text "Closer Description"
-#: build/trans_presets.java:1681
+#: build/trans_presets.java:1682
 msgid "Information Board"
 msgstr "Informasjonstavle"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1686
 msgid "Board Type"
 msgstr "Info Tavle type"
 
 #. item "Tourism/Information Board" combo "Board Type"
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1686
 msgid "board"
 msgstr "infotavle"
 
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1686
 msgid "history"
 msgstr "historisk"
 
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1686
 msgid "nature"
 msgstr "natur"
 
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1686
 msgid "wildlife"
 msgstr "dyreliv"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1688
+#: build/trans_presets.java:1689
 msgid "Guidepost (Hiking)"
 msgstr "Veiviser (turvei)"
 
 #. item "Tourism/Guidepost (Hiking)" text "Elevation"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1696
 msgid "Other Information Points"
 msgstr "Annen Informasjon"
 
-#. 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 "Ly for Natten"
-
-#. item
-#: build/trans_presets.java:1703
+#. item
+#: build/trans_presets.java:1704
 msgid "Edit Shelter"
 msgstr "Rediger Ly for Natten"
@@ -14391,25 +14723,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 "Bålplass"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1709
 msgid "Picnic Site"
 msgstr "Picnic Plass"
 
 #. item
-#: build/trans_presets.java:1709
+#: build/trans_presets.java:1710
 msgid "Edit Picnic Site"
 msgstr "Rediger Picnic Plass"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1716
 msgid "Historic Places"
 msgstr "Historiske steder"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1716
+#: build/trans_presets.java:1717
 msgid "Castle"
 msgstr "Slott"
@@ -14418,20 +14750,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 "Rediger Slott"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1724
 msgid "Ruins"
 msgstr "Ruiner"
 
 #. item
-#: build/trans_presets.java:1724
+#: build/trans_presets.java:1725
 msgid "Edit Ruins"
 msgstr "Rediger Ruiner"
 
 #. item "Historic Places/Ruins" text "Name"
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1729
 msgid "Archaeological Site"
 msgstr "Arkeologisk Plass"
@@ -14440,10 +14772,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 "Rediger Arkeologisk Plass"
 
 #. item "Historic Places/Archaeological Site" text "Name"
-#: build/trans_presets.java:1735
+#: build/trans_presets.java:1736
 msgid "Battlefield"
 msgstr "Slagmark"
@@ -14451,5 +14783,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 "Rediger Slagmark"
@@ -14457,15 +14789,15 @@
 #. item "Historic Places/Battlefield" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1743
 msgid "Monument"
 msgstr "Monument"
 
 #. item
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1744
 msgid "Edit Monument"
 msgstr "Rediger Monument"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1748
 msgid "Memorial"
 msgstr "Minneplatte"
@@ -14473,45 +14805,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 "Rediger Minneplatte"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1753
+#: build/trans_presets.java:1754
 msgid "Wayside Cross"
 msgstr "Kors i Veikant"
 
 #. item
-#: build/trans_presets.java:1754
+#: build/trans_presets.java:1755
 msgid "Edit Wayside Cross"
 msgstr "Rediger Kors i Veikant"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1758
+#: build/trans_presets.java:1759
 msgid "Wayside Shrine"
 msgstr "Veialter"
 
 #. item
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1760
 msgid "Edit Wayside Shrine"
 msgstr "Rediger Veialter"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1765
 msgid "Leisure"
 msgstr "Fritid"
 
 #. group "Leisure"
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1766
 msgid "Water Park"
 msgstr "Svømmehall"
 
 #. item
-#: build/trans_presets.java:1766
+#: build/trans_presets.java:1767
 msgid "Edit Water Park"
 msgstr "Rediger Svømmehall"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1770
+#: build/trans_presets.java:1771
 msgid "Playground"
 msgstr "Lekeplass"
@@ -14519,15 +14851,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 "Rediger Lekeplass"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1776
+#: build/trans_presets.java:1777
 msgid "Fishing"
 msgstr "Fiskeplass"
 
 #. item
-#: build/trans_presets.java:1777
+#: build/trans_presets.java:1778
 msgid "Edit Fishing"
 msgstr "Rediger Fiskeplass"
@@ -14535,15 +14867,15 @@
 #. item "Leisure/Fishing" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1783
+#: build/trans_presets.java:1784
 msgid "Sport Facilities"
 msgstr "Sport"
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1784
+#: build/trans_presets.java:1785
 msgid "Stadium"
 msgstr "Stadion"
 
 #. item
-#: build/trans_presets.java:1785
+#: build/trans_presets.java:1786
 msgid "Edit Stadium"
 msgstr "Rediger Stadion"
@@ -14557,6 +14889,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 "velg sport:"
@@ -14932,6 +15264,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
@@ -14964,227 +15296,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 "flerbruk"
 
-#: 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 "bueskyting"
 
-#: 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 "turn"
 
-#: 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 "australsk fotball"
 
-#: 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 "baseball"
 
-#: 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 "basketball"
 
-#: 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 "boules"
 
-#: 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 "bowling"
 
-#: 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 "kano"
 
-#: 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 "klatring"
 
-#: 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 "cricket"
 
-#: 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 "cricket_nets"
 
-#: 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 "krocket"
 
-#: 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 "sykling"
 
-#: 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 "hundeløp"
 
-#: 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 "ridning"
 
-#: 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 "football"
 
-#: 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 "golf"
 
-#: 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 "gymnastikk"
 
-#: 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 "ishockey"
 
-#: 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 "hesteløp"
 
-#: 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 "motorsport"
 
-#: 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 "pelota"
 
-#: 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 "racquet"
 
-#: 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 "rugby"
 
-#: 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 "skyting"
 
-#: 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 "skateboard"
 
-#: 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 "skøyter"
 
-#: 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 "ski"
 
-#: 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 "fotball"
 
-#: 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 "svømming"
 
-#: 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 "bordtennis"
 
-#: 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 "tennis"
 
-#: build/trans_presets.java:1793
+#: build/trans_presets.java:1794
 msgid "Sports Centre"
 msgstr "Sport Senter"
 
 #. item
-#: build/trans_presets.java:1794
+#: build/trans_presets.java:1795
 msgid "Edit Sports Centre"
 msgstr "Rediger Sport Senter"
 
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1803
 msgid "Pitch"
 msgstr "Bane"
 
 #. item
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1804
 msgid "Edit Pitch"
 msgstr "Rediger Bane"
 
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1812
 msgid "Racetrack"
 msgstr "Racerbane"
 
 #. item
-#: build/trans_presets.java:1812
+#: build/trans_presets.java:1813
 msgid "Edit Racetrack"
 msgstr "Rediger Racerbane"
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1821
 msgid "Golf Course"
 msgstr "Golfbane"
 
 #. item
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1822
 msgid "Edit Golf Course"
 msgstr "Rediger Golfbane"
 
 #. item "Sport Facilities/Golf Course" text "Name"
-#: build/trans_presets.java:1825
+#: build/trans_presets.java:1826
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item
-#: build/trans_presets.java:1826
+#: build/trans_presets.java:1827
 msgid "Edit Miniature Golf"
 msgstr "Rediger Minigolf"
 
 #. item "Sport Facilities/Miniature Golf" text "Name"
-#: build/trans_presets.java:1831
+#: build/trans_presets.java:1832
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1833
 msgid "Multi"
 msgstr "Flerbruk"
 
 #. item
-#: build/trans_presets.java:1833
+#: build/trans_presets.java:1834
 msgid "Edit Multi"
 msgstr "Rediger Flerbruk"
@@ -15223,191 +15555,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 "bane"
 
-#: 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 "sportsenter"
 
-#: 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 "stadion"
 
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1839
 msgid "10pin"
 msgstr "bowling"
 
 #. item
-#: build/trans_presets.java:1839
+#: build/trans_presets.java:1840
 msgid "Edit 10pin"
 msgstr "Rediger bowling"
 
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1845
 msgid "Athletics"
 msgstr "Turn"
 
 #. item
-#: build/trans_presets.java:1845
+#: build/trans_presets.java:1846
 msgid "Edit Athletics"
 msgstr "Rediger Turn"
 
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1851
 msgid "Archery"
 msgstr "Bueskyting"
 
 #. item
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:1852
 msgid "Edit Archery"
 msgstr "Rediger Bueskyting"
 
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:1857
 msgid "Climbing"
 msgstr "Klatring"
 
 #. item
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:1858
 msgid "Edit Climbing"
 msgstr "Rediger Klatring"
 
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1863
 msgid "Canoeing"
 msgstr "Kano"
 
 #. item
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:1864
 msgid "Edit Canoeing"
 msgstr "Rediger Kano"
 
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:1869
 msgid "Cycling"
 msgstr "Sykling"
 
 #. item
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1870
 msgid "Edit Cycling"
 msgstr "Rediger Sykling"
 
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1875
 msgid "Dog Racing"
 msgstr "Hundeløp"
 
 #. item
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1876
 msgid "Edit Dog Racing"
 msgstr "Rediger Hundeløp"
 
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1881
 msgid "Equestrian"
 msgstr "Ridning"
 
 #. item
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:1882
 msgid "Edit Equestrian"
 msgstr "Rediger Ridning"
 
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1887
 msgid "Horse Racing"
 msgstr "Hesteløp"
 
 #. item
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1888
 msgid "Edit Horse Racing"
 msgstr "Rediger Hesteløp"
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:1893
 msgid "Gymnastics"
 msgstr "Gymnastikk"
 
 #. item
-#: build/trans_presets.java:1893
+#: build/trans_presets.java:1894
 msgid "Edit Gymnastics"
 msgstr "Rediger Gymnastikk"
 
-#: build/trans_presets.java:1898
+#: build/trans_presets.java:1899
 msgid "Motor Sports"
 msgstr "Motor Sport"
 
 #. item
-#: build/trans_presets.java:1899
+#: build/trans_presets.java:1900
 msgid "Edit Motor Sports"
 msgstr "Rediger Motor Sport"
 
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:1905
 msgid "Skating"
 msgstr "Skøyter"
 
 #. item
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:1906
 msgid "Edit Skating"
 msgstr "Rediger Skøyter"
 
-#: build/trans_presets.java:1910
+#: build/trans_presets.java:1911
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:1912
 msgid "Edit Skateboard"
 msgstr "Rediger Skateboard"
 
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:1917
 msgid "Swimming"
 msgstr "Svømming"
 
 #. item
-#: build/trans_presets.java:1917
+#: build/trans_presets.java:1918
 msgid "Edit Swimming"
 msgstr "Rediger Svømming"
 
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:1923
 msgid "Skiing"
 msgstr "Ski"
@@ -15415,56 +15747,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 "Rediger Ski"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1928
 msgid "Piste type"
 msgstr "Løype Type"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1928
 msgid "downhill"
 msgstr "slalom"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1928
 msgid "nordic"
 msgstr "langrenn"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1928
 msgid "snow_park"
 msgstr "snø_park"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:1929
 msgid "Difficulty"
 msgstr "Vanskelighetsgrad"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:1929
 msgid "novice"
 msgstr "begynner"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:1929
 msgid "easy"
 msgstr "enkel"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:1929
 msgid "intermediate"
 msgstr "middels"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:1929
 msgid "advanced"
 msgstr "vanskelig"
 
-#: 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 "fristil"
 
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1932
 msgid "Shooting"
 msgstr "Skyting"
@@ -15472,178 +15804,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 "Rediger Skyting"
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1940
 msgid "Sport (Ball)"
 msgstr "Ballsport"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1941
 msgid "Soccer"
 msgstr "Fotball"
 
 #. item
-#: build/trans_presets.java:1941
+#: build/trans_presets.java:1942
 msgid "Edit Soccer"
 msgstr "Rediger Fotball"
 
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:1947
 msgid "Football"
 msgstr "Amerikansk Fotball"
 
 #. item
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:1948
 msgid "Edit Football"
 msgstr "Rediger Amerikansk Fotball"
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1953
 msgid "Australian Football"
 msgstr "Australsk Fotball"
 
 #. item
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:1954
 msgid "Edit Australian Football"
 msgstr "Rediger Australsk Fotball"
 
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:1959
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:1960
 msgid "Edit Baseball"
 msgstr "Rediger Baseball"
 
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:1965
 msgid "Basketball"
 msgstr "Basketball"
 
 #. item
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:1966
 msgid "Edit Basketball"
 msgstr "Rediger Basketball"
 
-#: 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 "Rediger Golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1975
 msgid "golf_course"
 msgstr "golfbane"
 
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:1977
 msgid "Boule"
 msgstr "Boule"
 
 #. item
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:1978
 msgid "Edit Boule"
 msgstr "Rediger Boule"
 
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:1983
 msgid "Bowls"
 msgstr "Bowling"
 
 #. item
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1984
 msgid "Edit Bowls"
 msgstr "Rediger Bowling"
 
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:1989
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:1990
 msgid "Edit Cricket"
 msgstr "Rediger Cricket"
 
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:1995
 msgid "Cricket Nets"
 msgstr "Cricket Nets"
 
 #. item
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:1996
 msgid "Edit Cricket Nets"
 msgstr "Rediger Cricket Nets"
 
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:2001
 msgid "Croquet"
 msgstr "Krocket"
 
 #. item
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:2002
 msgid "Edit Croquet"
 msgstr "Rediger Krocket"
 
-#: build/trans_presets.java:2006
+#: build/trans_presets.java:2007
 msgid "Hockey"
 msgstr "Ishockey"
 
 #. item
-#: build/trans_presets.java:2007
+#: build/trans_presets.java:2008
 msgid "Edit Hockey"
 msgstr "Rediger Ishockey"
 
-#: build/trans_presets.java:2012
+#: build/trans_presets.java:2013
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2014
 msgid "Edit Pelota"
 msgstr "Rediger Pelota"
 
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2019
 msgid "Racquet"
 msgstr "Racquet"
 
 #. item
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2020
 msgid "Edit Racquet"
 msgstr "Rediger Racquet"
 
-#: build/trans_presets.java:2024
+#: build/trans_presets.java:2025
 msgid "Rugby"
 msgstr "Rugby"
 
 #. item
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2026
 msgid "Edit Rugby"
 msgstr "Rediger Rugby"
 
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:2031
 msgid "Table Tennis"
 msgstr "Bordtennis"
 
 #. item
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2032
 msgid "Edit Table Tennis"
 msgstr "Rediger Bordtennis"
 
-#: 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 "Rediger Tennis"
 
 #. <separator/>
-#: build/trans_presets.java:2044
+#: build/trans_presets.java:2045
 msgid "Buildings"
 msgstr "Bygninger"
 
 #. group "Buildings"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2046
 msgid "Building"
 msgstr "Bygning"
@@ -15651,5 +15983,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2049
 msgid "Public Building"
 msgstr "Offentlig bygning"
@@ -15657,10 +15989,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 "Rediger Offentlig bygning"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2055
 msgid "Town hall"
 msgstr "Rådhus"
@@ -15668,10 +16000,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 "Rediger Rådhus"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2061
 msgid "Embassy"
 msgstr "Ambasade"
@@ -15679,10 +16011,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 "Rediger Ambasade"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2066
+#: build/trans_presets.java:2067
 msgid "Courthouse"
 msgstr "Domstol"
@@ -15691,10 +16023,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 "Rediger Domstol"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2074
 msgid "Prison"
 msgstr "Fengsel"
@@ -15703,10 +16035,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 "Rediger Fengsel"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2080
+#: build/trans_presets.java:2081
 msgid "Police"
 msgstr "Politi"
@@ -15716,10 +16048,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 "Rediger Politi"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2089
 msgid "Fire Station"
 msgstr "Brannstasjon"
@@ -15728,10 +16060,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 "Rediger Brannstasjon"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2096
 msgid "Post Office"
 msgstr "Postkontor"
@@ -15739,5 +16071,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 "Rediger Postkontor"
@@ -15745,15 +16077,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2103
 msgid "Kindergarten"
 msgstr "Barnehage"
 
 #. item
-#: build/trans_presets.java:2103
+#: build/trans_presets.java:2104
 msgid "Edit Kindergarten"
 msgstr "Rediger Barnehage"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2108
 msgid "School"
 msgstr "Skole"
@@ -15761,10 +16093,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 "Rediger Skole"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2114
 msgid "University"
 msgstr "Universitet"
@@ -15772,10 +16104,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 "Rediger Universitet"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2120
 msgid "College"
 msgstr "Høyskole"
@@ -15783,5 +16115,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 "Rediger Høyskole"
@@ -15789,5 +16121,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2126
+#: build/trans_presets.java:2127
 msgid "Cinema"
 msgstr "Kino"
@@ -15796,10 +16128,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 "Rediger KIno"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2133
+#: build/trans_presets.java:2134
 msgid "Library"
 msgstr "Bibliotek"
@@ -15808,10 +16140,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 "Rediger Bibliotek"
 
 #. item "Buildings/Library" text "Name"
-#: build/trans_presets.java:2140
+#: build/trans_presets.java:2141
 msgid "Arts Centre"
 msgstr "Kunstutstilling"
@@ -15819,10 +16151,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 "Rediger Kunstutstilling"
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2146
+#: build/trans_presets.java:2147
 msgid "Theatre"
 msgstr "Teater"
@@ -15831,10 +16163,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 "Rediger Teater"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2154
 msgid "Place of Worship"
 msgstr "Kirke"
@@ -15844,5 +16176,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 "Rediger Kirke"
@@ -15851,6 +16183,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 "Religion"
@@ -15859,66 +16191,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 "bahai"
 
-#: 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 "buddist"
 
-#: 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 "kristen"
 
-#: 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 "jain"
 
-#: 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 "jødisk"
 
-#: 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 "muslim"
 
-#: 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 "unitarisk"
 
-#: 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 "zoroastrisk"
 
-#: 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 "Trosretniing"
@@ -15927,81 +16259,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 "anglikansk"
 
-#: 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 "katolsk"
 
-#: 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 "evangelisk"
 
-#: 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 "jehovahs_vitner"
 
-#: 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 "luthersk"
 
-#: 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 "methodist"
 
-#: 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 "mormoner"
 
-#: 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 "orthodox"
 
-#: 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 "pentecostal"
 
-#: 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 "presbyteriansk"
 
-#: 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 "protestant"
 
-#: 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 "quaker"
 
-#: 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 "shia"
 
-#: 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 "sunni"
 
 #. <separator/>
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2165
 msgid "Addresses"
 msgstr "Adresser"
@@ -16010,5 +16342,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 "Rediger adresseinformasjon"
@@ -16016,5 +16348,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2169
+#: build/trans_presets.java:2170
 msgid "House number"
 msgstr "Husnummer"
@@ -16022,20 +16354,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2172
 msgid "House name"
 msgstr "Husnavn"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2174
 msgid "City name"
 msgstr "By / sted"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2174
+#: build/trans_presets.java:2175
 msgid "Post code"
 msgstr "Postnr"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2176
 msgid "Country code"
 msgstr "Land kode"
@@ -16043,5 +16375,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2179
 msgid "Address Interpolation"
 msgstr "Interpoler Adresser"
@@ -16050,5 +16382,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 "Rediger Interpolasjon"
@@ -16056,71 +16388,71 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2184
 msgid "Numbering scheme"
 msgstr "Nummereringsmåte"
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2184
 msgid "odd"
 msgstr "oddetall"
 
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2184
 msgid "even"
 msgstr "partall"
 
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2184
 msgid "all"
 msgstr "alle"
 
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2184
 msgid "alphabetic"
 msgstr "alfabetisk"
 
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2187
 msgid "Man Made"
 msgstr "Menneskeskapt"
 
 #. group "Man Made"
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2188
 msgid "Works"
 msgstr "Fabrikk"
 
 #. item
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2189
 msgid "Edit Works"
 msgstr "Rediger Fabrikk"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2193
 msgid "Tower"
 msgstr "Tårn"
 
 #. item
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2194
 msgid "Edit Tower"
 msgstr "Rediger Tårn"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2198
 msgid "Water Tower"
 msgstr "Vanntårn"
 
 #. item
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2199
 msgid "Edit Water Tower"
 msgstr "Rediger Vanntårn"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2203
 msgid "Gasometer"
 msgstr "Gasometer"
 
 #. item
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2204
 msgid "Edit Gasometer"
 msgstr "Rediger Gasometer"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2207
+#: build/trans_presets.java:2208
 msgid "Lighthouse"
 msgstr "Fyrtårn"
@@ -16128,10 +16460,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 "Rediger Fyrtårn"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2214
 msgid "Windmill"
 msgstr "Vindmølle"
@@ -16139,10 +16471,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 "Rediger Vindmølle"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2220
 msgid "Pipeline"
 msgstr "Rørledning"
@@ -16150,10 +16482,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 "Rediger Rørledning"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2225
+#: build/trans_presets.java:2226
 msgid "Wastewater Plant"
 msgstr "Kloakkrenseanlegg"
@@ -16163,10 +16495,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 "Rediger Kloakkrenseanlegg"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2233
+#: build/trans_presets.java:2234
 msgid "Crane"
 msgstr "Kran"
@@ -16174,10 +16506,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 "Rediger Kran"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2239
+#: build/trans_presets.java:2240
 msgid "Beacon"
 msgstr "Fyrlykt"
@@ -16185,10 +16517,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 "Rediger Fyrlykt"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2245
+#: build/trans_presets.java:2246
 msgid "Survey Point"
 msgstr "Trigpunkt"
@@ -16196,10 +16528,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 "Rediger Trigpunkt"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2252
 msgid "Surveillance"
 msgstr "Overvåkingskamera"
@@ -16207,5 +16539,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 "Rediger Overvåkingskamera"
@@ -16213,5 +16545,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2258
+#: build/trans_presets.java:2259
 msgid "Power Generator"
 msgstr "Kraftverk"
@@ -16221,39 +16553,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 "Rediger Kraftverk"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "wind"
 msgstr "vind"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "hydro"
 msgstr "vann"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "fossil"
 msgstr "fossil"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "nuclear"
 msgstr "atom"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "coal"
 msgstr "kull"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "photovoltaic"
 msgstr "solcelle"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "gas"
 msgstr "gass"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2268
 msgid "Power Station"
 msgstr "Kraftstasjon"
@@ -16262,10 +16594,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 "Rediger Kraftstasjon"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2274
+#: build/trans_presets.java:2275
 msgid "Power Sub Station"
 msgstr "Transformatorstasjon"
@@ -16274,5 +16606,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 "Rediger Transformatorstasjon"
@@ -16280,10 +16612,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 "Kraftlinje Nr"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2282
+#: build/trans_presets.java:2283
 msgid "Power Tower"
 msgstr "Kraftmast"
@@ -16294,5 +16626,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 "Rediger Kraftmast"
@@ -16300,5 +16632,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 "Kraftlinje"
@@ -16307,25 +16639,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 "Rediger Kraftlinje"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2298
 msgid "Voltage"
 msgstr "Spenning"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2299
 msgid "Amount of Wires"
 msgstr "Antall ledere"
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2301
+#: build/trans_presets.java:2302
 msgid "Amenities"
 msgstr "Bekvemligheter"
 
 #. group "Amenities"
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2303
 msgid "Toilets"
 msgstr "Toaletter"
@@ -16333,20 +16665,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 "Referanse Nr"
 
 #. 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 "Kommentar"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2312
 msgid "Post Box"
 msgstr "Postboks"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2317
 msgid "Telephone"
 msgstr "Telefon"
@@ -16355,5 +16687,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 "Rediger Telefon"
@@ -16361,5 +16693,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 "Mynter"
@@ -16367,5 +16699,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 "Sedler"
@@ -16373,5 +16705,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 "Elektronisk lommebok eller Kredittkort"
@@ -16379,5 +16711,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 "Bankkort"
@@ -16385,15 +16717,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 "Kredittkort"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2328
 msgid "Telephone cards"
 msgstr "Telefonkort"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2330
 msgid "Recycling"
 msgstr "Returstasjon"
@@ -16402,5 +16734,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 "Rediger Returstasjon"
@@ -16408,35 +16740,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 "Batterier"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2336
 msgid "Cans"
 msgstr "Bokser"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2337
 msgid "Clothes"
 msgstr "Klær"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2338
 msgid "Glass"
 msgstr "Glass"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2339
 msgid "Paper"
 msgstr "Papir"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2340
 msgid "Scrap Metal"
 msgstr "Metall"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2342
 msgid "Bench"
 msgstr "Benk"
@@ -16445,20 +16777,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 "Jaktpost"
 
 #. item
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2347
 msgid "Edit Hunting Stand"
 msgstr "Rediger Jaktpost"
 
 #. item "Amenities/Hunting Stand" check "Shelter"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2350
 msgid "Hide"
 msgstr "Skjul"
 
 #. item "Amenities/Hunting Stand" check "Hide"
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2351
 msgid "Lock"
 msgstr "Lås"
@@ -16466,22 +16798,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 "Høyde"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2351
+#: build/trans_presets.java:2352
 msgid "low"
 msgstr "lav"
 
-#: build/trans_presets.java:2351
+#: build/trans_presets.java:2352
 msgid "half"
 msgstr "halv"
 
-#: build/trans_presets.java:2351
+#: build/trans_presets.java:2352
 msgid "full"
 msgstr "full"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2354
 msgid "Fountain"
 msgstr "Fontene"
@@ -16490,10 +16822,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 "Rediger Fontene"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2361
 msgid "Drinking Water"
 msgstr "Drikkevann"
@@ -16502,10 +16834,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 "Rediger Drikkevann"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2367
+#: build/trans_presets.java:2368
 msgid "Baby Hatch"
 msgstr "Stellebord"
@@ -16513,25 +16845,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 "Rediger Stellebord"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2375
+#: build/trans_presets.java:2376
 msgid "Shops"
 msgstr "Butikker"
 
 #. group "Shops"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2377
 msgid "Supermarket"
 msgstr "Supermarked"
 
 #. item
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2378
 msgid "Edit Supermarket"
 msgstr "Rediger Supermarked"
 
 #. item "Shops/Supermarket" text "Name"
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:2382
 msgid "Convenience Store"
 msgstr "Mini Marked"
@@ -16539,10 +16871,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 "Rediger Mini Marked"
 
 #. item "Shops/Convenience Store" text "Name"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2388
 msgid "Kiosk"
 msgstr "Kiosk"
@@ -16550,10 +16882,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 "Rediger Kiosk"
 
 #. item "Shops/Kiosk" text "Name"
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2394
 msgid "Vending machine"
 msgstr "Automat"
@@ -16561,5 +16893,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 "Rediger Automat"
@@ -16567,88 +16899,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 "Automat produkter"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "public_transport_tickets"
 msgstr "billetter"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "public_transport_plans"
 msgstr "buss, trikk og togkart"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "parking_tickets"
 msgstr "parkeringsbillett"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "food"
 msgstr "mat"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "drinks"
 msgstr "drikke"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "sweets"
 msgstr "godter"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "cigarettes"
 msgstr "sigaretter"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "photos"
 msgstr "foto"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "animal_food"
 msgstr "dyremat"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "news_papers"
 msgstr "aviser"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "toys"
 msgstr "leker"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "stamps"
 msgstr "frimerke"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "SIM-cards"
 msgstr "SIM-kort"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "telephone_vouchers"
 msgstr "telefonkort"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "vouchers"
 msgstr "sedler"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "condoms"
 msgstr "kondomer"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "tampons"
 msgstr "tamponger"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "excrement_bags"
 msgstr "hundeposer"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2407
 msgid "Account or loyalty cards"
 msgstr "kundekort"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2408
+#: build/trans_presets.java:2409
 msgid "Butcher"
 msgstr "Slakter"
@@ -16656,10 +16988,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 "Rediger Slakter"
 
 #. item "Shops/Butcher" text "Name"
-#: build/trans_presets.java:2414
+#: build/trans_presets.java:2415
 msgid "Baker"
 msgstr "Baker"
@@ -16667,10 +16999,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 "Rediger Baker"
 
 #. item "Shops/Baker" text "Name"
-#: build/trans_presets.java:2420
+#: build/trans_presets.java:2421
 msgid "Florist"
 msgstr "Blomster"
@@ -16678,20 +17010,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 "Rediger Blomster"
 
 #. item "Shops/Florist" text "Name"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2427
 msgid "Organic"
 msgstr "Biologisk"
 
 #. item
-#: build/trans_presets.java:2427
+#: build/trans_presets.java:2428
 msgid "Edit Organic Shop"
 msgstr "Rediger Biologisk"
 
 #. item "Shops/Organic" text "Name"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2432
 msgid "Alcohol"
 msgstr "Sprit og Vin"
@@ -16699,60 +17031,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 "Rediger Sprit og Vin"
 
 #. item "Shops/Alcohol" text "Name"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2438
 msgid "Beverages"
 msgstr "Drikke"
 
 #. item
-#: build/trans_presets.java:2438
+#: build/trans_presets.java:2439
 msgid "Edit Beverages Shop"
 msgstr "Rediger Drikke"
 
 #. item "Shops/Beverages" text "Name"
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:2443
 msgid "Computer"
 msgstr "Kontor og Data"
 
 #. item
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2444
 msgid "Edit Computer Shop"
 msgstr "Rediger Kontor og Data"
 
 #. item "Shops/Computer" text "Name"
-#: build/trans_presets.java:2447
+#: build/trans_presets.java:2448
 msgid "Electronics"
 msgstr "Elektronisk"
 
 #. item
-#: build/trans_presets.java:2448
+#: build/trans_presets.java:2449
 msgid "Edit Electronics Shop"
 msgstr "Rediger Elektronisk"
 
 #. item "Shops/Electronics" text "Name"
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2453
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2454
 msgid "Edit Hifi Shop"
 msgstr "Rediger Hifi"
 
 #. item "Shops/Hifi" text "Name"
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2458
 msgid "Furniture"
 msgstr "Møbler"
 
 #. item
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2459
 msgid "Edit Furniture Shop"
 msgstr "Rediger Møbler"
 
 #. item "Shops/Furniture" text "Name"
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2463
 msgid "Garden Centre"
 msgstr "Hagesenter"
@@ -16760,10 +17092,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 "Rediger Hagesenter"
 
 #. item "Shops/Garden Centre" text "Name"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2469
 msgid "Hardware"
 msgstr "Jernvarehandel"
@@ -16771,10 +17103,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 "Rediger Jernvarehandel"
 
 #. item "Shops/Hardware" text "Name"
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2475
 msgid "Do-it-yourself-store"
 msgstr "Byggevare"
@@ -16782,60 +17114,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 "Rediger Byggevare"
 
 #. item "Shops/Do-it-yourself-store" text "Name"
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2481
 msgid "Stationery"
 msgstr "Kontor"
 
 #. item
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2482
 msgid "Edit Stationery Shop"
 msgstr "Rediger Kontor"
 
 #. item "Shops/Stationery" text "Name"
-#: build/trans_presets.java:2485
+#: build/trans_presets.java:2486
 msgid "Hairdresser"
 msgstr "Frisør"
 
 #. item
-#: build/trans_presets.java:2486
+#: build/trans_presets.java:2487
 msgid "Edit Hairdresser"
 msgstr "Rediger Frisør"
 
 #. item "Shops/Hairdresser" text "Name"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2491
 msgid "Shoes"
 msgstr "Sko"
 
 #. item
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2492
 msgid "Edit Shoe Shop"
 msgstr "Rediger Sko"
 
 #. item "Shops/Shoes" text "Name"
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2496
 msgid "Toys"
 msgstr "Leker"
 
 #. item
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2497
 msgid "Edit Toy Shop"
 msgstr "Rediger Leker"
 
 #. 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 "Rediger Video"
 
 #. item "Shops/Video" text "Name"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2506
 msgid "Dry Cleaning"
 msgstr "Renseri"
@@ -16843,10 +17175,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 "Rediger Renseri"
 
 #. item "Shops/Dry Cleaning" text "Name"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2512
 msgid "Laundry"
 msgstr "Vaskeri"
@@ -16854,10 +17186,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 "Rediger Vaskeri"
 
 #. item "Shops/Laundry" text "Name"
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2518
 msgid "Outdoor"
 msgstr "Friluftsutstyr"
@@ -16865,35 +17197,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 "Rediger Friluftsutstyr"
 
 #. 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 "Rediger Sport"
 
 #. item "Shops/Sports" text "Name"
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2529
 msgid "Optician"
 msgstr "Optiker"
 
 #. item
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2530
 msgid "Edit Optician"
 msgstr "Rediger Optiker"
 
 #. item "Shops/Optician" text "Name"
-#: build/trans_presets.java:2535
+#: build/trans_presets.java:2536
 msgid "Cash"
 msgstr "Valuta"
 
 #. group "Cash"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2537
 msgid "Bank"
 msgstr "Bank"
@@ -16901,5 +17233,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 "Rediger Bank"
@@ -16907,10 +17239,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 "Minibank"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2544
 msgid "Money Exchange"
 msgstr "Veksle Valuta"
@@ -16918,5 +17250,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 "Rediger Veksle Valuta"
@@ -16924,15 +17256,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 "Rediger Minibank"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2557
 msgid "Health"
 msgstr "Helse"
 
 #. group "Health"
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2558
 msgid "Doctors"
 msgstr "Lege"
@@ -16940,20 +17272,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 "Rediger Lege"
 
 #. item "Health/Doctors" text "Name"
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2564
 msgid "Dentist"
 msgstr "Tannlege"
 
 #. item
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2565
 msgid "Edit Dentist"
 msgstr "Rediger Tannlege"
 
 #. item "Health/Dentist" text "Name"
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2569
 msgid "Pharmacy"
 msgstr "Apotek"
@@ -16961,5 +17293,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 "Rediger Apotek"
@@ -16967,10 +17299,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 "Reseptlevering"
 
 #. item "Health/Pharmacy" text "Name"
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2576
 msgid "Hospital"
 msgstr "Sykehus"
@@ -16978,10 +17310,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 "Rediger Sykehus"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2582
 msgid "Emergency Access Point"
 msgstr "Redningsmøtepunkt"
@@ -16990,5 +17322,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 "Rediger Redningsmøtepunkt"
@@ -16997,20 +17329,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2588
 msgid "Point Number"
 msgstr "Punkt Nr"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2589
 msgid "Point Name"
 msgstr "Navn på punkt"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2591
 msgid "Phone Number"
 msgstr "Telefonnummer"
 
 #. 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 "(Benytt internasjonat nummer f.eks. +12-345-67890)"
@@ -17018,5 +17350,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 "Veterinær"
@@ -17025,25 +17357,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 "Rediger Veterinær"
 
 #. 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 "Rediger Kontinent"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2611
 msgid "Country"
 msgstr "Land"
 
 #. item
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2612
 msgid "Edit Country"
 msgstr "Rediger Land"
@@ -17051,30 +17383,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 "Stat"
 
 #. item
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2618
 msgid "Edit State"
 msgstr "Rediger Delstat"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2622
+#: build/trans_presets.java:2623
 msgid "Region"
 msgstr "Region"
 
 #. item
-#: build/trans_presets.java:2623
+#: build/trans_presets.java:2624
 msgid "Edit Region"
 msgstr "Rediger Region (Fylke)"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2628
+#: build/trans_presets.java:2629
 msgid "County"
 msgstr "Kommune"
 
 #. item
-#: build/trans_presets.java:2629
+#: build/trans_presets.java:2630
 msgid "Edit County"
 msgstr "Rediger Kommune"
@@ -17082,15 +17414,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2635
+#: build/trans_presets.java:2636
 msgid "City"
 msgstr "Storby"
 
 #. item
-#: build/trans_presets.java:2636
+#: build/trans_presets.java:2637
 msgid "Edit City"
 msgstr "Rediger Storby"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2641
+#: build/trans_presets.java:2642
 msgid "Town"
 msgstr "By"
@@ -17098,10 +17430,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 "Rediger By"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2649
 msgid "Suburb"
 msgstr "Forstad"
@@ -17109,25 +17441,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 "Rediger Bydel"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2656
 msgid "Village"
 msgstr "Landsby"
 
 #. item
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2657
 msgid "Edit Village"
 msgstr "Rediger Sted"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2662
 msgid "Hamlet"
 msgstr "Grend"
 
 #. item
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2663
 msgid "Edit Hamlet"
 msgstr "Rediger Lite Tettsted"
@@ -17135,5 +17467,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2669
 msgid "Locality"
 msgstr "Lokalitet"
@@ -17141,10 +17473,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 "Rediger Stedsnavn"
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2676
 msgid "Island"
 msgstr "Øy"
@@ -17152,5 +17484,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 "Rediger Øy"
@@ -17158,5 +17490,5 @@
 #. item "Places/Island" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2683
+#: build/trans_presets.java:2684
 msgid "Cave Entrance"
 msgstr "Huleinngang"
@@ -17164,10 +17496,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 "Rediger Huleinngang"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2690
 msgid "Peak"
 msgstr "Fjelltopp"
@@ -17175,10 +17507,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 "Rediger Fjelltopp"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2697
 msgid "Glacier"
 msgstr "Isbre"
@@ -17186,10 +17518,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 "Rediger Isbre"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2703
+#: build/trans_presets.java:2704
 msgid "Volcano"
 msgstr "Vulkan"
@@ -17197,70 +17529,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 "Rediger Vulkan"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2711
+#: build/trans_presets.java:2712
 msgid "Boundaries"
 msgstr "Grenser"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2713
 msgid "National"
 msgstr "Nasjonal"
 
 #. item
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2714
 msgid "Edit National Boundary"
 msgstr "Rediger Landegrense"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2718
+#: build/trans_presets.java:2719
 msgid "Administrative"
 msgstr "Fylkesgrense"
 
 #. item
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2720
 msgid "Edit Administrative Boundary"
 msgstr "Rediger Fylkesgrense"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2724
+#: build/trans_presets.java:2725
 msgid "Civil"
 msgstr "Kommunegrense"
 
 #. item
-#: build/trans_presets.java:2725
+#: build/trans_presets.java:2726
 msgid "Edit Civil Boundary"
 msgstr "Rediger Kommunegrense"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2730
+#: build/trans_presets.java:2731
 msgid "Political"
 msgstr "Politisk"
 
 #. item
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:2732
 msgid "Edit Political Boundary"
 msgstr "Rediger Politisk Grense"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2736
+#: build/trans_presets.java:2737
 msgid "National park"
 msgstr "Nasjonalpark"
 
 #. item
-#: build/trans_presets.java:2737
+#: build/trans_presets.java:2738
 msgid "Edit National Park Boundary"
 msgstr "Rediger Nasjonal Park Grense"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2744
 msgid "Land use"
 msgstr "Bruk av grunn"
 
 #. group "Land use"
-#: build/trans_presets.java:2744
+#: build/trans_presets.java:2745
 msgid "Tree"
 msgstr "Tre"
@@ -17269,15 +17601,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 "Rediger Tre"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2753
 msgid "Botanical Name"
 msgstr "Botanisk Navn"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2755
 msgid "Wood"
 msgstr "Skogsområde"
@@ -17286,5 +17618,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 "Rediger Skogsområde"
@@ -17292,17 +17624,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 "barskog"
 
-#: build/trans_presets.java:2760 build/trans_presets.java:2769
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
 msgid "deciduous"
 msgstr "løvskog"
 
-#: build/trans_presets.java:2760 build/trans_presets.java:2769
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
 msgid "mixed"
 msgstr "blandingsskog"
 
-#: build/trans_presets.java:2762
+#: build/trans_presets.java:2763
 msgid "Forest"
 msgstr "Skog"
@@ -17311,14 +17643,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 "Rediger Skog"
 
-#: build/trans_presets.java:2771
+#: build/trans_presets.java:2772
 msgid "Nature Reserve"
 msgstr "Natur reservat"
 
 #. item
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2773
 msgid "Edit Nature Reserve"
 msgstr "Rediger Naturreservat"
@@ -17326,25 +17658,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2777
+#: build/trans_presets.java:2778
 msgid "Scree"
 msgstr "Steinur"
 
 #. item
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:2779
 msgid "Edit Scree"
 msgstr "Rediger Steinur"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2783
 msgid "Scrub"
 msgstr "Krattskog"
 
 #. item
-#: build/trans_presets.java:2783
+#: build/trans_presets.java:2784
 msgid "Edit Scrub"
 msgstr "Rediger Krattskog"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2788
 msgid "Fell"
 msgstr "Fjell"
@@ -17352,10 +17684,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 "Rediger Fjell"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2794
 msgid "Heath"
 msgstr "Beite"
@@ -17363,5 +17695,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 "Rediger Beite"
@@ -17369,5 +17701,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2801
 msgid "Farmyard"
 msgstr "Gårdstun"
@@ -17376,45 +17708,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 "Rediger Gårdstun"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2808
+#: build/trans_presets.java:2809
 msgid "Farmland"
 msgstr "Åkerland"
 
 #. item
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2810
 msgid "Edit Farmland Landuse"
 msgstr "Rediger Åkerland"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2814
+#: build/trans_presets.java:2815
 msgid "Meadow"
 msgstr "Eng"
 
 #. item
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2816
 msgid "Edit Meadow Landuse"
 msgstr "Rediger Eng"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2820
+#: build/trans_presets.java:2821
 msgid "Vineyard"
 msgstr "Vingård"
 
 #. item
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2822
 msgid "Edit Vineyard Landuse"
 msgstr "Rediger Vingård"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2826
+#: build/trans_presets.java:2827
 msgid "Allotments"
 msgstr "Hageparseller"
 
 #. item
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:2828
 msgid "Edit Allotments Landuse"
 msgstr "Rediger Hageparseller"
@@ -17422,25 +17754,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2833
+#: build/trans_presets.java:2834
 msgid "Garden"
 msgstr "Hage"
 
 #. item
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2835
 msgid "Edit Garden"
 msgstr "Rediger Hage"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2838
+#: build/trans_presets.java:2839
 msgid "Grass"
 msgstr "Gress"
 
 #. item
-#: build/trans_presets.java:2839
+#: build/trans_presets.java:2840
 msgid "Edit Grass Landuse"
 msgstr "Rediger Gress"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2845
 msgid "Village Green"
 msgstr "Friområde"
@@ -17448,10 +17780,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 "Rediger Friområde"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:2852
 msgid "Common"
 msgstr "Offentlig"
@@ -17459,20 +17791,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 "Rediger Offentlig"
 
 #. 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 "Rediger Park"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2863
 msgid "Recreation Ground"
 msgstr "Friluftsområde"
@@ -17480,5 +17812,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 "Rediger Friluftsområde"
@@ -17486,15 +17818,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2871
 msgid "Residential area"
 msgstr "Boligområde"
 
 #. item
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2872
 msgid "Edit Residential Landuse"
 msgstr "Rediger Boligområde"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2877
 msgid "Graveyard"
 msgstr "Gravlund"
@@ -17502,9 +17834,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 "Rediger Gravlund"
 
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:2885
 msgid "Cemetery"
 msgstr "Kirkegård"
@@ -17512,39 +17844,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 "Rediger Kirkegård"
 
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2894
 msgid "Retail"
 msgstr "Forretninger"
 
 #. item
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2895
 msgid "Edit Retail Landuse"
 msgstr "Rediger Forretninger"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2900
 msgid "Commercial"
 msgstr "Næringsområde"
 
 #. item
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2901
 msgid "Edit Commercial Landuse"
 msgstr "Rediger Næringsområde"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2906
 msgid "Industrial"
 msgstr "Industriområde"
 
 #. item
-#: build/trans_presets.java:2906
+#: build/trans_presets.java:2907
 msgid "Edit Industrial Landuse"
 msgstr "Rediger Industriområde"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2912
 msgid "Railway land"
 msgstr "Jernbanegrunn"
@@ -17552,15 +17884,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 "Rediger Jernbanegrunn"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:2919
 msgid "Military"
 msgstr "Millitært"
 
 #. item
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2920
 msgid "Edit Military Landuse"
 msgstr "Rediger Millitært"
@@ -17568,55 +17900,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2925
+#: build/trans_presets.java:2926
 msgid "Construction area"
 msgstr "Byggeplass"
 
 #. item
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2927
 msgid "Edit Construction Landuse"
 msgstr "Rediger Byggeplass"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2932
 msgid "Brownfield"
 msgstr "Rivningsområde"
 
 #. item
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:2933
 msgid "Edit Brownfield Landuse"
 msgstr "Rediger Rivningsområde"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2937
+#: build/trans_presets.java:2938
 msgid "Greenfield"
 msgstr "Byggeområde"
 
 #. item
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:2939
 msgid "Edit Greenfield Landuse"
 msgstr "Rediger Byggeområde"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:2944
 msgid "Landfill"
 msgstr "Avfallsdeponi"
 
 #. item
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:2945
 msgid "Edit Landfill Landuse"
 msgstr "Rediger Avfallsdeponi"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2950
 msgid "Quarry"
 msgstr "Steinbrudd"
 
 #. item
-#: build/trans_presets.java:2950
+#: build/trans_presets.java:2951
 msgid "Edit Quarry Landuse"
 msgstr "Rediger Steinbrudd"
 
 #. group "Relations"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2960
 msgid "Multipolygon"
 msgstr "Multipolygon"
@@ -17626,5 +17958,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 "Rediger Multipolygon"
@@ -17633,10 +17965,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:2970
 msgid "outer segment"
 msgstr "ytre linjesegment (outer)"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:2970
+#: build/trans_presets.java:2971
 msgid "inner segment"
 msgstr "indre linjesegment (inner)"
@@ -17644,5 +17976,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:2974
 msgid "Turn restriction"
 msgstr "Svingeforbud"
@@ -17651,5 +17983,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 "Rediger Svingeforbud"
@@ -17657,34 +17989,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 "Forbud"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_left_turn"
 msgstr "venstresving_forbudt"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_right_turn"
 msgstr "høyresving_forbudt"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_straight_on"
 msgstr "rett_frem_forbudt"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_u_turn"
 msgstr "u-sving_forbudt"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "only_right_turn"
 msgstr "påbudt_høyre_sving"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "only_left_turn"
 msgstr "påbudt_venstre_sving"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "only_straight_on"
 msgstr "påbudt_rett_frem"
@@ -17693,15 +18025,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2983
+#: build/trans_presets.java:2984
 msgid "from way"
 msgstr "fra linje"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2985
 msgid "via node or way"
 msgstr "via Node eller Linje"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2986
 msgid "to way"
 msgstr "til Linje"
@@ -17709,5 +18041,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:2988
+#: build/trans_presets.java:2989
 msgid "Route"
 msgstr "Rute"
@@ -17716,5 +18048,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 "Rediger Rute"
@@ -17722,5 +18054,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 "Rute type"
@@ -17792,5 +18124,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
@@ -17799,17 +18131,17 @@
 msgstr "sykkel"
 
-#: 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 "vei"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "ferry"
 msgstr "ferrge"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "ski"
 msgstr "ski"
@@ -17862,5 +18194,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
@@ -17869,13 +18201,13 @@
 msgstr "fotgjenger"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "hiking"
 msgstr "tur"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "tram"
 msgstr "trikk"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "detour"
 msgstr "omkjøring"
@@ -17889,10 +18221,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 "T-bane"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:2997
 msgid "Symbol description"
 msgstr "Symbolforklaring"
@@ -17900,26 +18232,26 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:2999
+#: build/trans_presets.java:3000
 msgid "Network"
 msgstr "Nettverk"
 
 #. item "Relations/Route" combo "State"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "proposed"
 msgstr "planlagt"
 
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "alternate"
 msgstr "alternativ"
 
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "temporary"
 msgstr "midlertidig"
 
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "connection"
 msgstr "forbindelse"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3003
 msgid "Color (hex)"
 msgstr "Farge (hex)"
@@ -17928,30 +18260,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:3006
 msgid "route segment"
 msgstr "rute segment"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3007
 msgid "forward segment"
 msgstr "neste segment"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3008
 msgid "backward segment"
 msgstr "forrige avsnitt"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3009
 msgid "halt point"
 msgstr "stoppepunkt"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3010
 msgid "forward halt point"
 msgstr "neste stoppunkt"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3011
 msgid "backward halt point"
 msgstr "forrige stoppunkt"
@@ -22066,7 +22398,19 @@
 msgstr ""
 
+#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
+#~ msgstr "Du kan bruke mus eller Ctrl+piltaster/./ for å zoome og panorere."
+
 #~ msgid "Uploading data"
 #~ msgstr "Laster opp data"
 
+#~ msgid "Email"
+#~ msgstr "E-post"
+
+#~ msgid "Login name (email) to the OSM account."
+#~ msgstr "Innloggings navnet (e-postadresse) til OSM kontoen."
+
+#~ msgid "OSM username (email)"
+#~ msgstr "OSM brukernavn (e-postadressen)"
+
 #~ msgid "Unknown host"
 #~ msgstr "Ukjent vert"
@@ -22074,4 +22418,11 @@
 #~ msgid "Add either site-josm.xml or Wiki Pages."
 #~ msgstr "Tilføy enten site-josm.xml eller Wiki-sider."
+
+#~ msgid ""
+#~ "Server returned internal error. Try a reduced area or retry after waiting "
+#~ "some time."
+#~ msgstr ""
+#~ "Intern feil i Server. Prøv med et mindre område eller vent litt før du "
+#~ "prøver på nytt."
 
 #~ msgid "{0} Plugin successfully updated. Please restart JOSM."
@@ -22108,7 +22459,64 @@
 #~ msgstr "Feil ved sletting av programtillegg: {0}"
 
+#~ 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 URL.<br><b>Do not use a valuable Password.</b></html>"
+#~ msgstr ""
+#~ "<html>ADVARSEL: Passordet er lagret i vanlig tekst (IKKE KRYPTERT) i "
+#~ "konfigurasjons filen.<br>Passordet er overført i vanlig tekst til "
+#~ "serveren, satt inn i web adressen.<br><b>Ikke bruk et viktig passord da "
+#~ "andre kan lese det.</b></html>"
+
 #~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS"
 #~ msgstr ""
 #~ "Last ned Ortografisk korrekt bilde fra Metacarta's Map Rectifier WMS"
+
+#~ msgid ""
+#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab "
+#~ "- these will then show up in the WMS menu.\n"
+#~ "\n"
+#~ "You can also do this manually in the Advanced Preferences, using the "
+#~ "following schema:\n"
+#~ "wmsplugin.url.1.name=Landsat\n"
+#~ "wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n"
+#~ "wmsplugin.url.2.name=NPE Maps... etc\n"
+#~ "\n"
+#~ "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"
+#~ "\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"
+#~ "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"
+#~ "Note: Make sure the image is suitable, copyright-wise, if in doubt, don't "
+#~ "use."
+#~ msgstr ""
+#~ "Du kan legge til, endre eller slette WMS kilder i WMSplugin Innstillinger "
+#~ "- disse vil vises i WMS menyen.\n"
+#~ "Kan også settes manuelt i Avanserte innstillinger, etter følgende mal:\n"
+#~ "wmsplugin.url.1.name=Landsat\n"
+#~ "wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n"
+#~ "wmsplugin.url.2.name=NPE Maps... osv\n"
+#~ "\n"
+#~ "Full WMS URL input format eksempel (landsat)\n"
+#~ "http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n"
+#~ "layers=global_mosaic&styles=&srs=EPSG:4326&\n"
+#~ "format=image/jpeg \n"
+#~ "\n"
+#~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , må "
+#~ "du bare oppgi gyldig 'id'.\n"
+#~ "Å legge inn  Metacarta Map Rectifier menyer, lag en URL manuelt som i "
+#~ "dette eksempelet. Bytt ut  73 med din bilde 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"
+#~ "OBS:  Sjekk at bildet er egnet med hensyn til kopibeskyttelse. Er du i "
+#~ "tvil: la være å bruke bildet."
 
 #~ msgid ""
@@ -22130,6 +22538,42 @@
 #~ "{0}"
 
+#~ msgid "Open the OpenStreetBugs window and activate the automatic download"
+#~ msgstr "Åpne vindu med OpenStreetBugs og aktiviser automatisk nedlasting"
+
+#~ msgid ""
+#~ "Lambert zone {0} in cache  incompatible with current Lambert zone {1}"
+#~ msgstr ""
+#~ "Lambert sone {0} i mellomlager  stemmer ikke med aktiv Lambert sone {1}"
+
 #~ msgid "Delete and Download"
 #~ msgstr "Slett og last ned"
+
+#~ msgid "No intersections found. Nothing was changed."
+#~ msgstr "Ingen skjæringspunkt funnet. Ingen endringer utført."
+
+#~ msgid ""
+#~ "This action will require {0} individual download requests. Do you wish to "
+#~ "continue?"
+#~ msgstr "Dette vil kreve {0} runder med download requests. Fortsette?"
+
+#~ msgid ""
+#~ "An error occured while trying to match the photos to the GPX track. You "
+#~ "can adjust the sliders to manually match the photos."
+#~ msgstr ""
+#~ "Feil ved kobling av foto til GPX spor. Still inn rullefeltet for manuell "
+#~ "kobling."
+
+#~ msgid "The following errors occured during mass download:"
+#~ msgstr "Følgende feil oppsto under nedlasting:"
+
+#~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">english</A>."
+#~ msgstr "Hjelp mangler. Kan lages i <A HREF=\"{0}\">english</A>."
+
+#~ msgid ""
+#~ "Helppage missing. Create it in <A HREF=\"{0}\">english</A> or <A HREF="
+#~ "\"{1}\">your language</A>."
+#~ msgstr ""
+#~ "Hjelp mangler. Kan lages i <A HREF=\"{0}\">english</A> ellerr <A HREF="
+#~ "\"{1}\">norsk bokmål</A>."
 
 #~ msgid ""
@@ -22145,4 +22589,7 @@
 #~ msgstr "Ikke startet"
 
+#~ msgid "Cannot read numeric value from response"
+#~ msgstr "Finner ikke tallverdi i svaret"
+
 #~ msgid "Data upload failed for unknown reason"
 #~ msgstr "Opplasting av data feilet av ukjent grunn"
Index: applications/editors/josm/i18n/po/nl.po
===================================================================
--- applications/editors/josm/i18n/po/nl.po	(revision 16008)
+++ applications/editors/josm/i18n/po/nl.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-10 15:21+0000\n"
 "Last-Translator: Willem1 <willem.sonke@planet.nl>\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:44+0000\n"
+"X-Launchpad-Export-Date: 2009-06-19 19:32+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 "Help"
 
 #: ../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 ""
 "De projectie kon niet worden gelezen uit de voorkeuren. Mercator wordt "
@@ -75,6 +75,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
@@ -91,8 +93,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
@@ -141,5 +143,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"
@@ -540,5 +542,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}"
@@ -610,6 +612,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:92
-msgid "Email"
-msgstr "E-mail"
+msgid "E-Mail"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:96
@@ -647,12 +649,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
@@ -679,5 +683,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
@@ -710,15 +714,13 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:207
 #, java-format
-msgid "Helppage missing. Create it in <A HREF=\"{0}\">english</A>."
-msgstr "Help-pagina ontbreekt. Maak het in <A HREF=\"{0}\">nederlands</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 ""
-"De helppagina bestaat niet. Maak hem aan in het <A HREF=\"{0}\">Engels</A> "
-"of in <A HREF=\"{1}\">je eigen taal</A>."
 
 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:26
@@ -1150,13 +1152,13 @@
 msgstr "Hulp: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:99
 msgid "Status Report"
 msgstr "Statusrapport"
 
-#: ../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 "Klembord kopiëren en sluiten"
 
-#: ../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
@@ -1360,12 +1362,10 @@
 msgstr "Alles (escape) deselecteren"
 
-#: ../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 "Gegevens bijwerken"
 
-#: ../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 ""
@@ -1373,5 +1373,5 @@
 "gegevens)"
 
-#: ../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?"
@@ -1380,87 +1380,258 @@
 "gedownload?"
 
-#: ../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 ""
-"Deze opdracht zal {0} individuele downloadverzoeken vereisen. Toch doorgaan?"
-
-#: ../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 "Naar OSM uploaden..."
 
-#: ../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 "Upload alle aanpassingen naar de OSM-server."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:96
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:94
 msgid "Objects to add:"
 msgstr "Objecten om toe te voegen:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102
 msgid "Objects to modify:"
 msgstr "Objecten om te bewerken:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:110
 msgid "Objects to delete:"
 msgstr "Objecten om aan te verwijderen:"
 
-#: ../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 "Beschrijf kort de veranderingen die je upload:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:126
 msgid "Upload these changes?"
 msgstr "Deze veranderingen uploaden?"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:130
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
 msgid "Upload Changes"
 msgstr "Aanpassingen uploaden"
 
-#: ../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 "Niets om te uploaden. Creëer eerst gegevens."
 
-#: ../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 "Er zijn nog onopgeloste conflicten, deze dien je eerst op te lossen."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:182
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:180
 msgid "No changes to upload."
 msgstr "Geen aanpassingen aanwezig om te uploaden."
 
-#: ../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 ""
@@ -1565,37 +1736,51 @@
 msgstr "Rauwe GPS-gegevens"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:44
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:46
 msgid "Downloading data"
 msgstr "Gegevens worden gedownload"
 
-#: ../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 "Geen gegevens geïmporteerd."
 
-#: ../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 "Gegevenslaag {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 "OpenStreetMap-gegevens"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:37
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:45
 msgid "Data Layer"
 msgstr "Gegevenslaag"
 
-#: ../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 "Download {0} van {1} ({2} te gaan)"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:88
-msgid "The following errors occured during mass download:"
-msgstr "Tijdens bulkdownload traden de volgende fouten op:"
-
-#: ../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 "Fouten tijdens download"
+
+#: ../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
@@ -1648,34 +1833,34 @@
 msgstr "Kan geen knoop buiten de wereld toevoegen."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:495
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:493
 msgid "Add node"
 msgstr "Knoop toevoegen"
 
-#: ../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 "Knoop in weg toevoegen"
 
-#: ../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 "Bestaande weg aan knoop koppelen"
 
-#: ../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 "Een nieuwe knoop aan een bestaande weg toevoegen"
 
-#: ../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 "Knoop in weg voegen en verbinden"
 
-#: ../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 "Nieuwe node maken."
 
-#: ../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 "Selecteer de node onder de cursor."
 
-#: ../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."
@@ -1684,14 +1869,14 @@
 msgstr[1] "Nieuwe nodes toevoegen aan {0} wegen."
 
-#: ../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 "Start een nieuwe weg vanaf de node."
 
-#: ../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 "Weg voortzetten vanaf laatste knoop."
 
-#: ../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 "Tekenen beëindigen"
@@ -2017,26 +2202,32 @@
 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 "Selectie laden"
 
-#: ../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 "Verbinden met {0}..."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:45
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:46
 msgid "Downloading..."
 msgstr "Downloaden..."
 
-#: ../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 "Kan niet lezen van URL: \"{0}\""
 
-#: ../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 "Ontleedfout in URL: \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:74
+msgid "Error while communicating with server."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67
@@ -2097,13 +2288,85 @@
 msgstr "Los {0} conflicten in {1} objecten op"
 
-#: ../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 "{1} {0} verwijderen"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97
+#, java-format
+msgid "Delete {0} {1}"
+msgstr "{0} {1} verwijderen"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153
+msgid "Conflicting relation"
+msgstr "Conflicterende relatie"
+
+#: ../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 ""
+"Selectie \"{0}\" wordt gebruikt door relatie \"{1}\" met rol {2}.\n"
+"Uit relatie verwijderen?"
+
+#: ../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 "Uit relatie verwijderen"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
+#, java-format
+msgid ""
+"Selection \"{0}\" is used by relation \"{1}\".\n"
+"Delete from relation?"
+msgstr ""
+"Selectie \"{0}\" wordt gebruikt door relatie \"{1}\".\n"
+"Verwijder van relatie?"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:366
+msgid "Split way segment"
+msgstr "Wegsegment splitsen"
+
+#. 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 ""
+"Je staat op het punt knopen te verwijderen buiten het gebied dat je hebt "
+"gedownload.<br>Dit kan problemen veroorzaken omdat andere objecten (die je "
+"niet ziet) ze kunnen gebruiken.<br>Wil je ze echt verwijderen?"
+
+#: ../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 "Verplaatsen"
+
 #: ../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"
@@ -2112,10 +2375,220 @@
 msgstr[1] "knopen"
 
-#: ../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 "RemoveRelationMember"
+
+#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
+msgid "Rotate"
+msgstr "Roteren"
+
+#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88
+msgid "Sequence"
+msgstr "Volgorde"
+
+#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:72
+#, java-format
+msgid "Resolve {0} tag conflicts in {1} {2}"
+msgstr "Los {0} tag-conflicten op in {1} {2}"
+
+#: ../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 "Versieconflicten voor {0} {1} oplossen"
+
+#: ../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 "Toepassen?"
+
+#: ../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 ""
+"Bij het omkeren van de rijrichting worden de volgende veranderingen van "
+"eigenschappen van de weg en zijn knopen voorgesteld om de gegevens "
+"consistent te houden."
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28
+msgid "Relation"
+msgstr "Relatie"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30
+msgid "Old role"
+msgstr "Oude rol"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:32
+msgid "New role"
+msgstr "Nieuwe rol"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
+msgid "Old key"
+msgstr "Oude sleutel"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
+msgid "Old value"
+msgstr "Oude waarde"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
+msgid "New key"
+msgstr "Nieuwe sleutel"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
+msgid "New value"
+msgstr "Nieuwe waarde"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:40
+msgid "Apply selected changes"
+msgstr "Geselecteerde wijzigingen toepassen"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41
+msgid "Don't apply changes"
+msgstr "Wijzigingen niet toepassen"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:83
+msgid "Please select which property changes you want to apply."
+msgstr "Selecteer welke wijzigingen in eigenschappen je wilt toepassen."
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:96
+msgid "Properties of "
+msgstr "Eigenschappen van "
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:120
+msgid "Roles in relations referring to"
+msgstr "Rollen in relaties verwijzen naar"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:136
+msgid "Automatic tag correction"
+msgstr "Automatische tagcorrectie"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:314
+#, java-format
+msgid "Malformed config file at lines {0}"
+msgstr "Configuratiebestand is verminkt in regels {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:324
+#, java-format
+msgid "Cannot open preferences directory: {0}"
+msgstr "Kan voorkeurenmap niet openen: {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 "Voorkeurenbestand bevat fouten. Backup maken van de oude naar {0}."
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:79
+#, java-format
+msgid "Preferences stored on {0}"
+msgstr "Voorkeuren opgeslagen op {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:82
+#, java-format
+msgid "Could not upload preferences. Reason: {0}"
+msgstr "Kan geen voorkeuren uploaden. Reden: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:93
+msgid "Could not load preferences from server."
+msgstr "Kan geen voorkeuren van server laden."
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:34
+msgid "different"
+msgstr "verschillend"
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:262
+msgid "deleted"
+msgstr "verwijderd"
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
+msgid "true"
+msgstr "Waar"
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
+msgid "false"
+msgstr "onwaar"
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20
+msgid "position"
+msgstr "positie"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30
+msgid "Decimal Degrees"
+msgstr "Decimale graden"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
+msgid "Degrees Minutes Seconds"
+msgstr "Graden minuten seconden"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+msgid "S"
+msgstr "Z"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+msgid "N"
+msgstr "N"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+msgid "W"
+msgstr "W"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+msgid "E"
+msgstr "O"
+
+#: ../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 "onvolledig"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
+#, java-format
+msgid "Error: {0}"
+msgstr "Fout: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
+#, java-format
+msgid "Warning: {0}"
+msgstr "Waarschuwing: {0}"
+
+#: ../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"
@@ -2124,8 +2597,10 @@
 msgstr[1] "wegen"
 
-#: ../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
@@ -2136,266 +2611,27 @@
 msgstr[1] "relaties"
 
-#: ../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 "{1} {0} verwijderen"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97
-#, java-format
-msgid "Delete {0} {1}"
-msgstr "{0} {1} verwijderen"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153
-msgid "Conflicting relation"
-msgstr "Conflicterende relatie"
-
-#: ../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 ""
-"Selectie \"{0}\" wordt gebruikt door relatie \"{1}\" met rol {2}.\n"
-"Uit relatie verwijderen?"
-
-#: ../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 "Uit relatie verwijderen"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
-#, java-format
-msgid ""
-"Selection \"{0}\" is used by relation \"{1}\".\n"
-"Delete from relation?"
-msgstr ""
-"Selectie \"{0}\" wordt gebruikt door relatie \"{1}\".\n"
-"Verwijder van relatie?"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:366
-msgid "Split way segment"
-msgstr "Wegsegment splitsen"
-
-#. 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 ""
-"Je staat op het punt knopen te verwijderen buiten het gebied dat je hebt "
-"gedownload.<br>Dit kan problemen veroorzaken omdat andere objecten (die je "
-"niet ziet) ze kunnen gebruiken.<br>Wil je ze echt verwijderen?"
-
-#: ../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 "Verplaatsen"
-
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:52
-#, java-format
-msgid "Resolve conflicts in member list of of relation {0}"
-msgstr "Conflicten in ledenlijst van relatie {0} oplossen"
-
-#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66
-msgid "RemoveRelationMember"
-msgstr "RemoveRelationMember"
-
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
-msgid "Rotate"
-msgstr "Roteren"
-
-#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88
-msgid "Sequence"
-msgstr "Volgorde"
-
-#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:84
-#, java-format
-msgid "Resolve {0} tag conflicts in {1} {2}"
-msgstr "Los {0} tag-conflicten op in {1} {2}"
-
-#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:57
-#, java-format
-msgid "Resolve version conflicts for {0} {1}"
-msgstr "Versieconflicten voor {0} {1} oplossen"
-
-#: ../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 "Toepassen?"
-
-#: ../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 ""
-"Bij het omkeren van de rijrichting worden de volgende veranderingen van "
-"eigenschappen van de weg en zijn knopen voorgesteld om de gegevens "
-"consistent te houden."
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28
-msgid "Relation"
-msgstr "Relatie"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30
-msgid "Old role"
-msgstr "Oude rol"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:32
-msgid "New role"
-msgstr "Nieuwe rol"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
-msgid "Old key"
-msgstr "Oude sleutel"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
-msgid "Old value"
-msgstr "Oude waarde"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
-msgid "New key"
-msgstr "Nieuwe sleutel"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
-msgid "New value"
-msgstr "Nieuwe waarde"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:40
-msgid "Apply selected changes"
-msgstr "Geselecteerde wijzigingen toepassen"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41
-msgid "Don't apply changes"
-msgstr "Wijzigingen niet toepassen"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:83
-msgid "Please select which property changes you want to apply."
-msgstr "Selecteer welke wijzigingen in eigenschappen je wilt toepassen."
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:96
-msgid "Properties of "
-msgstr "Eigenschappen van "
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:120
-msgid "Roles in relations referring to"
-msgstr "Rollen in relaties verwijzen naar"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:136
-msgid "Automatic tag correction"
-msgstr "Automatische tagcorrectie"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:314
-#, java-format
-msgid "Malformed config file at lines {0}"
-msgstr "Configuratiebestand is verminkt in regels {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:324
-#, java-format
-msgid "Cannot open preferences directory: {0}"
-msgstr "Kan voorkeurenmap niet openen: {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 "Voorkeurenbestand bevat fouten. Backup maken van de oude naar {0}."
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:79
-#, java-format
-msgid "Preferences stored on {0}"
-msgstr "Voorkeuren opgeslagen op {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:82
-#, java-format
-msgid "Could not upload preferences. Reason: {0}"
-msgstr "Kan geen voorkeuren uploaden. Reden: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:93
-msgid "Could not load preferences from server."
-msgstr "Kan geen voorkeuren van server laden."
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:34
-msgid "different"
-msgstr "verschillend"
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:262
-msgid "deleted"
-msgstr "verwijderd"
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
-msgid "true"
-msgstr "Waar"
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
-msgid "false"
-msgstr "onwaar"
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20
-msgid "position"
-msgstr "positie"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30
-msgid "Decimal Degrees"
-msgstr "Decimale graden"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
-msgid "Degrees Minutes Seconds"
-msgstr "Graden minuten seconden"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
-msgid "S"
-msgstr "Z"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
-msgid "N"
-msgstr "N"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
-msgid "W"
-msgstr "W"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
-msgid "E"
-msgstr "O"
-
-#: ../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 "onvolledig"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
-#, java-format
-msgid "Error: {0}"
-msgstr "Fout: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
-#, java-format
-msgid "Warning: {0}"
-msgstr "Waarschuwing: {0}"
-
-#: ../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"
@@ -2409,5 +2645,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:122
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "railway"
 msgstr "spoorweg"
@@ -2429,4 +2665,62 @@
 msgstr[1] "{0} knopen"
 
+#: ../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."
@@ -2574,5 +2868,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 "achtergrond"
@@ -2662,8 +2956,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
@@ -2675,7 +2969,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
@@ -2784,10 +3078,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 "Gebruikersnaam"
 
 #: ../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 "Wachtwoord"
@@ -2885,22 +3179,22 @@
 "gebruikt."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:146
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148
 msgid "File"
 msgstr "Bestand"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150
 msgid "View"
 msgstr "Beeld"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:149
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151
 msgid "Tools"
 msgstr "Gereedschappen"
 
-#: ../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 "Voorkeuze"
 
-#: ../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
@@ -2913,21 +3207,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 "Draadmodelweergave"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:218
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221
 msgid "Toggle Wireframe view"
 msgstr "Draadmodelweergave in- of uitschakelen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:244
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:247
 msgid "Full Screen"
 msgstr "Volledig scherm"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:246
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:249
 msgid "Toggle Full Screen view"
 msgstr "Volledig scherm aan-/uitzetten"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:286
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:289
 msgid "Audio"
 msgstr "Geluid"
@@ -2999,6 +3293,6 @@
 msgstr "(geen object)"
 
-#: ../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 "laag niet in lijst."
@@ -3008,9 +3302,9 @@
 msgstr "Met OSM-server verbinden..."
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:104
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:105
 msgid "Error while parsing"
 msgstr "Probleem tijdens lezen"
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:107
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:108
 msgid "File not found"
 msgstr "Bestand niet gevonden"
@@ -3085,5 +3379,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 "Leden"
@@ -3279,5 +3573,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
@@ -3359,5 +3653,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 "parameter '{0}' mag niet leeg zijn"
@@ -3396,5 +3690,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 ""
 
@@ -3448,5 +3742,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 "Rol"
@@ -3550,5 +3844,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
@@ -3863,5 +4157,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 "Relaties"
@@ -3968,66 +4262,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 "Wijzigingen toepassen"
 
-#: ../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 "Basis"
 
-#: ../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 "Bezet door"
 
-#: ../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 "Tags (lege waarde verwijdert de tag)"
 
-#: ../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 "Omhoog bewegen"
 
-#: ../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 "De geselecteerde leden omhoog verplaatsen"
 
-#: ../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 "Selectie toevoegen"
 
-#: ../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 "Alle geselecteerde objecten als leden toevoegen"
 
-#: ../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 "Geselecteerde verwijderen"
 
-#: ../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 "Alle nu geselecteerde objecten uit relatie verwijderen"
 
-#: ../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 "Omlaag bewegen"
 
-#: ../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 "De geselecteerde leden omlaag verplaatsen"
 
-#: ../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 "De leden in de huidige tabelrij uit deze relatie verwijderen"
 
-#: ../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 "Leden downloaden"
 
-#: ../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 "Alle incomplete wegen en daarbij behorende knopen downloaden"
@@ -4072,5 +4366,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
@@ -4091,9 +4385,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 "ja"
 
-#: ../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
@@ -4115,31 +4409,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 "nee"
 
-#: ../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 "Leden: {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 "Relatie-editor: {0}"
 
-#: ../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 "Er zijn conflicten tijdens het importeren."
 
-#: ../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 "Ontleden van de serverreactie is mislukt."
 
-#: ../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 "Kan niet met server verbinden."
+
+#: ../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
@@ -4205,17 +4502,17 @@
 msgstr "Gegevensbronnen en -soorten"
 
-#: ../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 "Als nieuwe laag downloaden"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:174
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:173
 msgid "Download Area"
 msgstr "Gebied downloaden"
 
-#: ../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 "Gebied te groot om te downloaden; server zal waarschijnlijk weigeren."
 
-#: ../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 ""
@@ -4245,5 +4542,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 "Locaties"
@@ -4290,21 +4587,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 "soort"
@@ -4344,14 +4641,4 @@
 msgid "Tile Numbers"
 msgstr "Tegelnummers"
-
-#: ../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 "Je kunt met de muis of CTRL+pijltoetsen zoomen en verplaatsen."
-
-#. 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
@@ -4430,5 +4717,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)"
@@ -4544,14 +4831,14 @@
 msgstr "Wave-geluidsbestanden (*.wav)"
 
-#: ../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 "Geluidsmarkers van {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244
 msgid "Import images"
 msgstr "Afbeeldingen importeren"
 
-#: ../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, "
@@ -4560,5 +4847,5 @@
 msgstr[1] "{0} tracks, "
 
-#: ../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, "
@@ -4567,5 +4854,5 @@
 msgstr[1] "{0} routes, "
 
-#: ../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"
@@ -4574,28 +4861,28 @@
 msgstr[1] "{0} waypoints"
 
-#: ../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 "Naam: {0}"
 
-#: ../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 "Beschrijving: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347
 msgid "Timespan: "
 msgstr "Tijdsperiode: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354
 msgid "Length: "
 msgstr "Lengte: "
 
-#: ../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 "Naar gegevenslaag omzetten"
 
-#: ../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 ""
@@ -4606,11 +4893,11 @@
 "zijn.<br>Als je sporen wilt uploaden, kijk dan hier:"
 
-#: ../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
@@ -4620,29 +4907,29 @@
 msgstr "Omgezet van: {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 "Uit OSM langs deze track downloaden"
 
-#: ../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 "Alles downloaden binnen:"
 
-#: ../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 "{0} meters"
 
-#: ../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 "Maximum oppervlak per verzoek:"
 
-#: ../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 "{0} km2"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:822
 #, java-format
 msgid ""
@@ -4653,9 +4940,9 @@
 "verder<br>gaan?</html>"
 
-#: ../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 "Geen GPX-track in laag beschikbaar om geluid mee te koppelen."
 
-#: ../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 "
@@ -4665,5 +4952,5 @@
 "de track zijn overgeslagen of naar de start verplaatst."
 
-#: ../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 "
@@ -4673,33 +4960,42 @@
 "kunnen schatten, zijn overgeslagen."
 
-#: ../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 "buiten gedownload gebied"
 
-#: ../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 "versie {0}"
 
-#: ../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 "{0} bestaat uit:"
 
-#: ../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} verwijderd.)"
 
-#: ../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 "API-versie: {0}"
 
-#: ../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"
@@ -4707,21 +5003,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"
@@ -4869,5 +5165,5 @@
 msgstr "Standaardwaarde is onbekend (instelling is nog niet gebruikt)."
 
-#: ../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
@@ -4876,5 +5172,5 @@
 msgstr "Selecteer een rij om te bewerken."
 
-#: ../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
@@ -4882,5 +5178,5 @@
 msgstr "Nieuwe waarde voor {0}"
 
-#: ../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
@@ -4890,5 +5186,5 @@
 msgstr "Selecteer een rij om te verwijderen."
 
-#: ../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 "Nieuw sleutel/waardepaar invoeren"
@@ -5782,106 +6078,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 "Naam"
@@ -6362,6 +6658,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:36
-msgid "Login name (email) to the OSM account."
-msgstr "Loginnaam (e-mail) van het OSM-account."
+msgid "Login name (e-mail) to the OSM account."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
@@ -6376,6 +6672,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
-msgid "OSM username (email)"
-msgstr "OSM-gebruikersnaam (e-mail)"
+msgid "OSM username (e-mail)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
@@ -6386,11 +6682,7 @@
 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 ""
-"<html>WAARSCHUWING: het wachtwoord wordt als gewone tekst in het "
-"voorkeurenbestand opgeslagen<br>en ook als gewone tekst naar de server "
-"verzonden, verwerkt in de URL.<br><b>Gebruik dus geen waardevol wachtwoord.</"
-"b></html>"
 
 #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on
@@ -6710,6 +7002,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 "Met OSM-server verbinden..."
@@ -6720,7 +7013,7 @@
 msgstr "Downloaden van punten {0} tot {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 "OSM-gegevens downloaden"
@@ -6785,15 +7078,14 @@
 msgstr "Importeren NMEA is mislukt!"
 
-#: ../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 ""
@@ -6802,31 +7094,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 "Changeset openen"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:351
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298
 msgid "Closing changeset..."
 msgstr "Changeset sluiten"
 
-#: ../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 "Voorbereiden…"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:381
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:326
 msgid "Uploading..."
 msgstr "Uploaden..."
@@ -6841,25 +7139,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 "Verkeerd wachtwoord of gebruikersnaam."
 
-#: ../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 "Waarschuwing: het wachtwoord wordt onversleuteld verstuurd."
 
-#: ../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 "Gebruikersnaam en wachtwoord opslaan (onversleuteld)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:89
 msgid "Enter Password"
 msgstr "Voer wachtwoord in"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
 msgid "Login"
 msgstr "Login"
 
-#: ../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..."
@@ -6870,4 +7168,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."
@@ -6960,9 +7301,23 @@
 msgstr "Misvormde knoop-id"
 
-#: ../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 "Met server verbinden..."
 
-#: ../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."
@@ -6970,17 +7325,9 @@
 "Kan niet met de OSM-server verbinden. Controleer je internetverbinding."
 
-#: ../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 antwoordde met interne fout. Verklein het gebied of probeer het later "
-"nog eens."
-
-#: ../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 ""
 
@@ -6996,5 +7343,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 "Plugins downloaden"
@@ -7186,9 +7533,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 "Ontbrekende plugins downloaden"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:128
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:119
 #, java-format
 msgid ""
@@ -7201,6 +7548,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
@@ -7223,35 +7570,35 @@
 msgstr "onbekend"
 
-#: ../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}: versie {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 gebundeld met JOSM"
 
-#: ../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 "Fout tijdens lezen plugin-informatiebestand: {0}"
 
-#: ../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 "Dit is na het einde van de opname"
 
-#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:329
+#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:340
 msgid "Error playing sound"
 msgstr "Fout tijdens afspelen van het geluid"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
 msgid "Do nothing"
 msgstr "Niets doen"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
 msgid "Report Bug"
 msgstr "Fout melden"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:52
 msgid ""
 "An unexpected exception occurred.\n"
@@ -7265,19 +7612,19 @@
 "van JOSM gebruikt, wees dan vriendelijk en dien een foutenrapport in."
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55
 msgid "Unexpected Exception"
 msgstr "Er is een onverwachte fout opgetreden"
 
-#: ../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 "Maak een melding bij {0}"
 
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:67
+msgid "Include your steps to get to the error (as detailed as possible)!"
+msgstr ""
+"Beschrijf de gevolgde stappen die tot de fout leidde (zo precies mogelijk)!"
+
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:68
-msgid "Include your steps to get to the error (as detailed as possible)!"
-msgstr ""
-"Beschrijf de gevolgde stappen die tot de fout leidde (zo precies mogelijk)!"
-
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69
 msgid ""
 "Try updating to the newest version of JOSM and all plugins before reporting "
@@ -7287,9 +7634,9 @@
 "je de fout meldt."
 
-#: ../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 "Voeg zeker de volgende informatie toe:"
 
-#: ../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 "(De tekst is reeds gekopieerd naar je klembord.)"
@@ -7373,5 +7720,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 "Beschrijving"
@@ -7753,9 +8100,7 @@
 #: ../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 ""
-"Het koppelen van de foto's aan de GPX-track is mislukt. Je kunt de "
-"schuifbalken handmatig aanpassen zodat ze met de foto's overeenkomen."
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:853
@@ -7787,5 +8132,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"
@@ -7808,5 +8152,5 @@
 msgstr "Bufferbestand Lambert-zone 4 (.4)"
 
-#: ../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
@@ -7901,6 +8245,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/"
@@ -7992,6 +8336,6 @@
 msgstr "Voeg \"source=...\" toe aan elementen?"
 
-#: ../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
@@ -7999,11 +8343,11 @@
 msgstr "{0} downloaden"
 
-#: ../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 "Met WMS-server verbinden..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:157
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:158
 msgid "Create buildings"
 msgstr "Gebouwen aanmaken"
@@ -8022,13 +8366,13 @@
 msgstr "Schakel auto-sourcing in en controleer cadastre millesime."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:61
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:62
 msgid "Extract SVG ViewBox..."
 msgstr "SVG ViewBox uitnemen..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:65
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:66
 msgid "Extract best fitting boundary..."
 msgstr "Best passende grens uitnemen"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:126
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:127
 msgid "Create boundary"
 msgstr "Kader aanmaken"
@@ -8049,5 +8393,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 "Afbeelding van Franse Cadastre WMS downloaden"
 
@@ -8145,5 +8489,5 @@
 "Selecteer er eerst één en probeer dan opnieuw"
 
-#: ../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
@@ -8151,59 +8495,28 @@
 msgstr "Lege laag"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:176
 #, java-format
 msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr "WMS-laag ({0}), {1} tegel(s) geladen"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:183
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:178
 msgid "Is not vectorized."
 msgstr "Is niet gevectoriseerd."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:179
 #, java-format
 msgid "Raster center: {0}"
 msgstr "Middelpunt raster: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181
 msgid "Is vectorized."
 msgstr "Is gevectoriseerd."
 
-#: ../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 "Omvattende reschthoek gemeente: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:282
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
-msgid "Save WMS layer to file"
-msgstr "WMS-laag in bestand opslaan"
-
-#: ../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 "WMS-laag uit bestand laden"
-
-#: ../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 "Niet-ondersteunde WMS-bestandsversie; is {0}, verwachtte {1}"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:325
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:335
-msgid "File Format Error"
-msgstr "Fout in bestandsindeling"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:481
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:401
 #, java-format
 msgid ""
@@ -8214,15 +8527,14 @@
 "Maak een nieuwe aan."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:482
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402
 msgid "Cache Format Error"
 msgstr "Fout in bufferstructuur"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:497
-#, java-format
-msgid "Lambert zone {0} in cache  incompatible with current Lambert zone {1}"
-msgstr ""
-"Lambert-zone {0} in buffer is niet compatibel met huidige Lambert-zone {1}"
-
-#: ../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 "Fout in buffer Lambert-zone"
@@ -8317,11 +8629,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 "Pad van GPX-laag importeren"
 
 #: ../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 "Bestaand pad laten vallen"
@@ -8331,5 +8643,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 "Geen GPX-gegevenslaag gevonden."
@@ -8620,4 +8932,8 @@
 msgid "Lakewalker trace"
 msgstr "Lakewalker-trace"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:10
+msgid "An unknown error has occurred"
+msgstr ""
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
@@ -8939,42 +9255,42 @@
 msgstr "LiveGPS"
 
-#: ../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 "Gemeten waarden"
 
-#: ../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 "Het meetscherm openen."
 
-#: ../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 "Herstellen"
 
-#: ../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 "De huidige meetresultaten herstellen en het meetpad verwijderen."
 
-#: ../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 "Padlengte"
 
-#: ../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 "Lengte van selectie"
 
-#: ../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 "Oppervlak van selectie"
 
-#: ../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 "Hoek"
 
-#: ../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 "Hoek tussen twee geselecteerde knopen"
 
-#: ../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 "Laag om in te meten"
@@ -9035,6 +9351,6 @@
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
-msgid "Open the OpenStreetBugs window and activate the automatic download"
-msgstr "Opent het OpenStreetBugs-scherm en activeert de automatische download"
+msgid "Opens the OpenStreetBugs window and activates the automatic download"
+msgstr ""
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:123
@@ -9111,5 +9427,5 @@
 msgstr "Osmarender"
 
-#: ../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 "
@@ -9119,9 +9435,9 @@
 "kaartinstellingenpagina van Voorkeuren."
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:123
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:127
 msgid "osmarender options"
 msgstr "osmarender-optie"
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:124
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:128
 msgid "Firefox executable"
 msgstr "Firefox-executable"
@@ -9552,5 +9868,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 "Straatnaam"
@@ -9644,6 +9960,6 @@
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:195
-msgid "No intersections found. Nothing was changed."
-msgstr "Geen doorsnijdingen gevolgende. Er is niets veranderd."
+msgid "No intersection found. Nothing was changed."
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:217
@@ -10537,43 +10853,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 ""
-"Je kunt WMS-invoer in het tabblad WMSplugin-voorkeuren toevoegen, bewerken "
-"en wissen - deze zullen in het WMS-menu getoond worden.\n"
-"\n"
-"Je kunt dit ook handmatig doen in de Uitgebreide voorkeuren, gebruikmakend "
-"van het volgende schema:\n"
-"wmsplugin.url.1.name=Landsat\n"
-"wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n"
-"wmsplugin.url.2.name=NPE Maps... enzovoort\n"
-"\n"
-"Volledig voorbeeld van een WMS-URL (landsat)\n"
-"http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n"
-"layers=global_mosaic&styles=&srs=EPSG:4326&\n"
-"format=image/jpeg \n"
-"\n"
-"Voor de Metacarta's Map Rectifier (http://labs.metacarta.com/rectifier/) "
-"moet je de betreffende 'id' invoeren.\n"
-"Om een  menuitem van Metacarta Map Rectifier toe te voegen, maak je een URL "
-"volgens het volgende voorbeeld, waarbij 73 vervangen wordt door je eigen "
-"afbeeldings-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"
-"Merk op: Weet zeker dat de afbeelding vrij is van copyrights. Bij twijfel: "
-"niet gebruiken."
-
-#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:54
+
+#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:53
 msgid "WMS Plugin Help"
 msgstr "WMS-pluginhulp"
@@ -10632,5 +10923,5 @@
 msgstr "De positie van de geselecteerde WMS-laag aanpassen"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113
 #, java-format
 msgid ""
@@ -10677,4 +10968,29 @@
 msgid "Alpha channel"
 msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
+msgid "Save WMS layer to file"
+msgstr "WMS-laag in bestand opslaan"
+
+#: ../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 "WMS-laag uit bestand laden"
+
+#: ../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 "Niet-ondersteunde WMS-bestandsversie; is {0}, verwachtte {1}"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:335
+msgid "File Format Error"
+msgstr "Fout in bestandsindeling"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:163
@@ -10770,4 +11086,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 ""
@@ -10782,5 +11103,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 ""
 
@@ -11064,5 +11385,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 "Referentie"
@@ -11564,5 +11885,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 "Breedte (meters)"
@@ -12031,7 +12352,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 "Soort"
@@ -12647,10 +12968,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 "Bedrijf"
@@ -12862,7 +13183,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 "Stijging"
@@ -13794,5 +14115,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 "Parkeergeld"
@@ -13928,5 +14249,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 "Referentie (tracknummer)"
@@ -13934,5 +14255,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 "Gebied"
@@ -13984,11 +14305,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 "Schuilplaats"
+
+#. item "Public Transport/Bus Stop" check "Shelter"
 #. </optional>
-#: build/trans_presets.java:1503
+#: build/trans_presets.java:1504
 msgid "Bus Platform"
 msgstr "Busstation"
 
 #. item
-#: build/trans_presets.java:1504
+#: build/trans_presets.java:1505
 msgid "Edit Bus Platform"
 msgstr "Busplatform bewerken"
@@ -13996,5 +14327,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1512
+#: build/trans_presets.java:1513
 msgid "Taxi"
 msgstr "Taxi"
@@ -14002,5 +14333,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 "Taxistandplaats bewerken"
@@ -14008,5 +14339,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1519
+#: build/trans_presets.java:1520
 msgid "Airport"
 msgstr "Luchthaven"
@@ -14014,15 +14345,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 "IATA"
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1527
+#: build/trans_presets.java:1528
 msgid "ICAO"
 msgstr "ICAO"
@@ -14031,5 +14362,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1532
+#: build/trans_presets.java:1533
 msgid "Accomodation"
 msgstr "Accomodatie"
@@ -14041,5 +14372,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 "Hotel"
@@ -14048,15 +14379,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 "Hotel bewerken"
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1539
+#: build/trans_presets.java:1540
 msgid "Stars"
 msgstr "Sterren"
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1541
+#: build/trans_presets.java:1542
 msgid "Motel"
 msgstr "Motel"
@@ -14064,20 +14395,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 "Motel bewerken"
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1547
+#: build/trans_presets.java:1548
 msgid "Guest House"
 msgstr "Pension"
 
 #. item
-#: build/trans_presets.java:1548
+#: build/trans_presets.java:1549
 msgid "Edit Guest House"
 msgstr "Pension bewerken"
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1552
+#: build/trans_presets.java:1553
 msgid "Chalet"
 msgstr "Chalet"
@@ -14085,10 +14416,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 "Chalet bewerken"
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1558
+#: build/trans_presets.java:1559
 msgid "Hostel"
 msgstr "Hostel"
@@ -14096,30 +14427,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 "Hostel bewerken"
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1564
+#: build/trans_presets.java:1565
 msgid "Alpine Hut"
 msgstr "Berghut"
 
 #. item
-#: build/trans_presets.java:1565
+#: build/trans_presets.java:1566
 msgid "Edit Alpine Hut"
 msgstr "Berghut bewerken"
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1570
+#: build/trans_presets.java:1571
 msgid "Caravan Site"
 msgstr "Caravanpark"
 
 #. item
-#: build/trans_presets.java:1571
+#: build/trans_presets.java:1572
 msgid "Edit Caravan Site"
 msgstr "Caravanpark bewerken"
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1575
+#: build/trans_presets.java:1576
 msgid "Camping Site"
 msgstr "Kampeerterrein"
@@ -14127,10 +14458,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 "Kampeerterrein bewerken"
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1582
+#: build/trans_presets.java:1583
 msgid "Food+Drinks"
 msgstr "Eten en drinken"
@@ -14141,5 +14472,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 "Restaurant"
@@ -14147,5 +14478,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 "Restaurant bewerken"
@@ -14153,5 +14484,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 "Keuken"
@@ -14159,61 +14490,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 "Italiaanse keuken"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "chinese"
 msgstr "Chinese keuken"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "burger"
 msgstr "hamburger"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "greek"
 msgstr "Grieks"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "german"
 msgstr "Duits"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "indian"
 msgstr "Indiaas"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "regional"
 msgstr "lokaal"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "kebab"
 msgstr "Kebab"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "turkish"
 msgstr "Turks"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "asian"
 msgstr "Oosters"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "thai"
 msgstr "Thais"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "mexican"
 msgstr "Mexicaans"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "japanese"
 msgstr "Japans"
 
-#: build/trans_presets.java:1590
+#: build/trans_presets.java:1591
 msgid "Fast Food"
 msgstr "Fast Food"
@@ -14221,9 +14552,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 "Fast-Food-restaurant bewerken"
 
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1598
 msgid "Cafe"
 msgstr "Café"
@@ -14231,10 +14562,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 "Café bewerken"
 
 #. item "Food+Drinks/Cafe" text "Name"
-#: build/trans_presets.java:1603
+#: build/trans_presets.java:1604
 msgid "Pub"
 msgstr "Kroeg"
@@ -14242,20 +14573,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 "Kroeg bewerken"
 
 #. item "Food+Drinks/Pub" text "Name"
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1610
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item
-#: build/trans_presets.java:1610
+#: build/trans_presets.java:1611
 msgid "Edit Biergarten"
 msgstr "Biergarten bewerken"
 
 #. item "Food+Drinks/Biergarten" text "Name"
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1615
 msgid "Bar"
 msgstr ""
@@ -14263,10 +14594,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 "Nachtclub"
@@ -14274,20 +14605,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 "Nachtclub bewerken"
 
 #. item "Food+Drinks/Nightclub" text "Name"
-#: build/trans_presets.java:1627
+#: build/trans_presets.java:1628
 msgid "Tourism"
 msgstr "Toerisme"
 
 #. group "Tourism"
-#: build/trans_presets.java:1628
+#: build/trans_presets.java:1629
 msgid "Attraction"
 msgstr "Attractie"
 
 #. item
-#: build/trans_presets.java:1629
+#: build/trans_presets.java:1630
 msgid "Edit Attraction"
 msgstr "Attractie bewerken"
@@ -14296,11 +14627,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 "Openingstijden"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1634
+#: build/trans_presets.java:1635
 msgid "Museum"
 msgstr "Museum"
@@ -14308,10 +14639,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 "Museum bewerken"
 
 #. item "Tourism/Museum" text "Name"
-#: build/trans_presets.java:1640
+#: build/trans_presets.java:1641
 msgid "Zoo"
 msgstr "Dierentuin"
@@ -14320,10 +14651,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 "Dierentuin bewerken"
 
 #. item "Tourism/Zoo" text "Name"
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1648
 msgid "Viewpoint"
 msgstr "Uitkijkpunt"
@@ -14331,25 +14662,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 "Uitkijkpunt bewerken"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1652
+#: build/trans_presets.java:1653
 msgid "Look-Out Tower"
 msgstr "Uitkijktoren"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1654
+#: build/trans_presets.java:1655
 msgid "Theme Park"
 msgstr "Themapark"
 
 #. item
-#: build/trans_presets.java:1655
+#: build/trans_presets.java:1656
 msgid "Edit Theme Park"
 msgstr "Themapart bewerken"
 
 #. item "Tourism/Theme Park" text "Name"
-#: build/trans_presets.java:1659
+#: build/trans_presets.java:1660
 msgid "Artwork"
 msgstr "Kunstwerk"
@@ -14357,5 +14688,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 "Kunstwerk bewerken"
@@ -14363,5 +14694,5 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1667
 msgid "Information Office"
 msgstr ""
@@ -14369,83 +14700,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 "kaart"
 
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1679
 msgid "citymap"
 msgstr "stadskaart"
 
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1679
 msgid "hikingmap"
 msgstr "wandelkaart"
 
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1679
 msgid "bicyclemap"
 msgstr "fietskaart"
 
 #. 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 "bord"
 
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1686
 msgid "history"
 msgstr "geschiedenis"
 
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1686
 msgid "nature"
 msgstr "natuur"
 
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1686
 msgid "wildlife"
 msgstr "Wild"
 
 #. 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 "Schuilplaats"
-
-#. item
-#: build/trans_presets.java:1703
+#. item
+#: build/trans_presets.java:1704
 msgid "Edit Shelter"
 msgstr "Schuilplaats bewerken"
@@ -14453,25 +14781,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 "Vuurplaats"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1709
 msgid "Picnic Site"
 msgstr "Picnicplek"
 
 #. item
-#: build/trans_presets.java:1709
+#: build/trans_presets.java:1710
 msgid "Edit Picnic Site"
 msgstr "Picnicplek bewerken"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1716
 msgid "Historic Places"
 msgstr "Historische locaties"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1716
+#: build/trans_presets.java:1717
 msgid "Castle"
 msgstr "Kasteel"
@@ -14480,20 +14808,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 "Kasteel bewerken"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1724
 msgid "Ruins"
 msgstr "Ruïne"
 
 #. item
-#: build/trans_presets.java:1724
+#: build/trans_presets.java:1725
 msgid "Edit Ruins"
 msgstr "Ruïne bewerken"
 
 #. item "Historic Places/Ruins" text "Name"
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1729
 msgid "Archaeological Site"
 msgstr "Archeologische plaats"
@@ -14502,10 +14830,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 "Archeologische plaats bewerken"
 
 #. item "Historic Places/Archaeological Site" text "Name"
-#: build/trans_presets.java:1735
+#: build/trans_presets.java:1736
 msgid "Battlefield"
 msgstr "Slagveld"
@@ -14513,5 +14841,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 "Slagveld bewerken"
@@ -14519,15 +14847,15 @@
 #. item "Historic Places/Battlefield" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1743
 msgid "Monument"
 msgstr "Monument"
 
 #. item
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1744
 msgid "Edit Monument"
 msgstr "Monument bewerken"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1748
 msgid "Memorial"
 msgstr "Herdenkingsplek"
@@ -14535,45 +14863,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 "Herdenkingsplek bewerken"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1753
+#: build/trans_presets.java:1754
 msgid "Wayside Cross"
 msgstr "Kruis langs de weg"
 
 #. item
-#: build/trans_presets.java:1754
+#: build/trans_presets.java:1755
 msgid "Edit Wayside Cross"
 msgstr "Kruis langs de weg bewerken"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1758
+#: build/trans_presets.java:1759
 msgid "Wayside Shrine"
 msgstr "Kapelletje langs de weg"
 
 #. item
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1760
 msgid "Edit Wayside Shrine"
 msgstr "Kapelletje bewerken"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1765
 msgid "Leisure"
 msgstr "Vrije tijd"
 
 #. group "Leisure"
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1766
 msgid "Water Park"
 msgstr "Zwembad"
 
 #. item
-#: build/trans_presets.java:1766
+#: build/trans_presets.java:1767
 msgid "Edit Water Park"
 msgstr "Zwembad bewerken"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1770
+#: build/trans_presets.java:1771
 msgid "Playground"
 msgstr "Speelveld"
@@ -14581,15 +14909,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 "Speelveld bewerken"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1776
+#: build/trans_presets.java:1777
 msgid "Fishing"
 msgstr "Visstek"
 
 #. item
-#: build/trans_presets.java:1777
+#: build/trans_presets.java:1778
 msgid "Edit Fishing"
 msgstr "Visstek bewerken"
@@ -14597,15 +14925,15 @@
 #. item "Leisure/Fishing" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1783
+#: build/trans_presets.java:1784
 msgid "Sport Facilities"
 msgstr "Sportfaciliteiten"
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1784
+#: build/trans_presets.java:1785
 msgid "Stadium"
 msgstr "Stadion"
 
 #. item
-#: build/trans_presets.java:1785
+#: build/trans_presets.java:1786
 msgid "Edit Stadium"
 msgstr "Stadion bewerken"
@@ -14619,6 +14947,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 "sport selecteren:"
@@ -14994,6 +15322,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
@@ -15026,227 +15354,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 "Meervoudig"
 
-#: 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 "Boogschieten"
 
-#: 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 "Atletiek"
 
-#: 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 "Australisch football"
 
-#: 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 "Honkbal"
 
-#: 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 "Basketball"
 
-#: 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 "Boules"
 
-#: 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 "Bowling"
 
-#: 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 "Kanoën"
 
-#: 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 "Klimmen"
 
-#: 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 "Cricket"
 
-#: 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 "Cricket netten"
 
-#: 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 "Croquet"
 
-#: 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 "Fietsen"
 
-#: 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 "Hondenraces"
 
-#: 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 "Paardensport"
 
-#: 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 "Football"
 
-#: 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 "Golf"
 
-#: 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 "Turnen"
 
-#: 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 "Hockey"
 
-#: 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 "Paardenraces"
 
-#: 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 "Motorsport"
 
-#: 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 "Pelota"
 
-#: 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 "Badminton"
 
-#: 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 "Rugby"
 
-#: 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 "Schieten"
 
-#: 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 "Skateboarden"
 
-#: 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 "Schaatsen"
 
-#: 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 "Skiën"
 
-#: 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 "Voetbal"
 
-#: 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 "Zwemmen"
 
-#: 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 "Tafeltennis"
 
-#: 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 "Tennis"
 
-#: build/trans_presets.java:1793
+#: build/trans_presets.java:1794
 msgid "Sports Centre"
 msgstr "Sportcentrum"
 
 #. item
-#: build/trans_presets.java:1794
+#: build/trans_presets.java:1795
 msgid "Edit Sports Centre"
 msgstr "Sportcentrum bewerken"
 
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1803
 msgid "Pitch"
 msgstr "Sportveld"
 
 #. item
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1804
 msgid "Edit Pitch"
 msgstr "Sportveld bewerken"
 
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1812
 msgid "Racetrack"
 msgstr "Wedstrijdbaan"
 
 #. item
-#: build/trans_presets.java:1812
+#: build/trans_presets.java:1813
 msgid "Edit Racetrack"
 msgstr "Wedstrijdbaan bewerken"
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1821
 msgid "Golf Course"
 msgstr "Golfbaan"
 
 #. item
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1822
 msgid "Edit Golf Course"
 msgstr "Golfbaan bewerken"
 
 #. item "Sport Facilities/Golf Course" text "Name"
-#: build/trans_presets.java:1825
+#: build/trans_presets.java:1826
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item
-#: build/trans_presets.java:1826
+#: build/trans_presets.java:1827
 msgid "Edit Miniature Golf"
 msgstr "Minigolf bewerken"
 
 #. item "Sport Facilities/Miniature Golf" text "Name"
-#: build/trans_presets.java:1831
+#: build/trans_presets.java:1832
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1833
 msgid "Multi"
 msgstr "Verzameling"
 
 #. item
-#: build/trans_presets.java:1833
+#: build/trans_presets.java:1834
 msgid "Edit Multi"
 msgstr "Verzameling bewerken"
@@ -15285,191 +15613,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 "Sportveld"
 
-#: 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 "Sportcentrum"
 
-#: 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 "Stadion"
 
-#: 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 "Atletiek"
 
 #. item
-#: build/trans_presets.java:1845
+#: build/trans_presets.java:1846
 msgid "Edit Athletics"
 msgstr "Atletiek bewerken"
 
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1851
 msgid "Archery"
 msgstr "Boogschieten"
 
 #. item
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:1852
 msgid "Edit Archery"
 msgstr "Boogschieten bewerken"
 
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:1857
 msgid "Climbing"
 msgstr "Klimmen"
 
 #. item
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:1858
 msgid "Edit Climbing"
 msgstr "Klimmen bewerken"
 
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1863
 msgid "Canoeing"
 msgstr "Kanoën"
 
 #. item
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:1864
 msgid "Edit Canoeing"
 msgstr "Kanoën bewerken"
 
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:1869
 msgid "Cycling"
 msgstr "Fietsen"
 
 #. item
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1870
 msgid "Edit Cycling"
 msgstr "Fietsen bewerken"
 
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1875
 msgid "Dog Racing"
 msgstr "Hondenracen"
 
 #. item
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1876
 msgid "Edit Dog Racing"
 msgstr "Hondenracen bewerken"
 
-#: 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 "Paardenracen"
 
 #. item
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1888
 msgid "Edit Horse Racing"
 msgstr "Paardenracen bewerken"
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:1893
 msgid "Gymnastics"
 msgstr "Turnen"
 
 #. item
-#: build/trans_presets.java:1893
+#: build/trans_presets.java:1894
 msgid "Edit Gymnastics"
 msgstr "Turnen bewerken"
 
-#: build/trans_presets.java:1898
+#: build/trans_presets.java:1899
 msgid "Motor Sports"
 msgstr "Motorracen"
 
 #. item
-#: build/trans_presets.java:1899
+#: build/trans_presets.java:1900
 msgid "Edit Motor Sports"
 msgstr "Motorracen bewerken"
 
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:1905
 msgid "Skating"
 msgstr "Schaatsen"
 
 #. item
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:1906
 msgid "Edit Skating"
 msgstr "Schaatsen bewerken"
 
-#: build/trans_presets.java:1910
+#: build/trans_presets.java:1911
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:1912
 msgid "Edit Skateboard"
 msgstr "Skateboard bewerken"
 
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:1917
 msgid "Swimming"
 msgstr "Zwemmen"
 
 #. item
-#: build/trans_presets.java:1917
+#: build/trans_presets.java:1918
 msgid "Edit Swimming"
 msgstr "Zwemmen bewerken"
 
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:1923
 msgid "Skiing"
 msgstr "Skiën"
@@ -15477,56 +15805,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 "Skiën bewerken"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1928
 msgid "Piste type"
 msgstr "Soort piste"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1928
 msgid "downhill"
 msgstr "bergafwaarts"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1928
 msgid "nordic"
 msgstr "Scandinavisch"
 
-#: 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 "Moeilijkheidsgraad"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:1929
 msgid "novice"
 msgstr "beginner"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:1929
 msgid "easy"
 msgstr "eenvoudig"
 
-#: 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 "expert"
 
-#: 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 "Schieten"
@@ -15534,178 +15862,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 "Schieten bewerken"
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1940
 msgid "Sport (Ball)"
 msgstr "Balsporten"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1941
 msgid "Soccer"
 msgstr "Voetbal"
 
 #. item
-#: build/trans_presets.java:1941
+#: build/trans_presets.java:1942
 msgid "Edit Soccer"
 msgstr "Voetbal bewerken"
 
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:1947
 msgid "Football"
 msgstr "Football"
 
 #. item
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:1948
 msgid "Edit Football"
 msgstr "Football bewerken"
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1953
 msgid "Australian Football"
 msgstr "Australisch football"
 
 #. item
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:1954
 msgid "Edit Australian Football"
 msgstr "Australisch football bewerken"
 
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:1959
 msgid "Baseball"
 msgstr "Honkbal"
 
 #. item
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:1960
 msgid "Edit Baseball"
 msgstr "Honkbal bewerken"
 
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:1965
 msgid "Basketball"
 msgstr "Basketball"
 
 #. item
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:1966
 msgid "Edit Basketball"
 msgstr "Basketball bewerken"
 
-#: 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 "Golf bewerken"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1975
 msgid "golf_course"
 msgstr "golfbaan"
 
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:1977
 msgid "Boule"
 msgstr "Boule"
 
 #. item
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:1978
 msgid "Edit Boule"
 msgstr "Boule bewerken"
 
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:1983
 msgid "Bowls"
 msgstr "Bowlen"
 
 #. item
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1984
 msgid "Edit Bowls"
 msgstr "Bowlen bewerken"
 
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:1989
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:1990
 msgid "Edit Cricket"
 msgstr "Cricket bewerken"
 
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:1995
 msgid "Cricket Nets"
 msgstr "Cricketnetten"
 
 #. item
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:1996
 msgid "Edit Cricket Nets"
 msgstr "Cricketnetten bewerken"
 
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:2001
 msgid "Croquet"
 msgstr "Croquet"
 
 #. item
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:2002
 msgid "Edit Croquet"
 msgstr "Croquet bewerken"
 
-#: build/trans_presets.java:2006
+#: build/trans_presets.java:2007
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item
-#: build/trans_presets.java:2007
+#: build/trans_presets.java:2008
 msgid "Edit Hockey"
 msgstr "Hockey bewerken"
 
-#: build/trans_presets.java:2012
+#: build/trans_presets.java:2013
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2014
 msgid "Edit Pelota"
 msgstr "Pelota bewerken"
 
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2019
 msgid "Racquet"
 msgstr "Badminton"
 
 #. item
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2020
 msgid "Edit Racquet"
 msgstr "Badminton bewerken"
 
-#: build/trans_presets.java:2024
+#: build/trans_presets.java:2025
 msgid "Rugby"
 msgstr "Rugby"
 
 #. item
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2026
 msgid "Edit Rugby"
 msgstr "Rugby bewerken"
 
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:2031
 msgid "Table Tennis"
 msgstr "Tafeltennis"
 
 #. item
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2032
 msgid "Edit Table Tennis"
 msgstr "Tafeltennis bewerken"
 
-#: 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 "Tennis bewerken"
 
 #. <separator/>
-#: build/trans_presets.java:2044
+#: build/trans_presets.java:2045
 msgid "Buildings"
 msgstr "Gebouwen"
 
 #. group "Buildings"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2046
 msgid "Building"
 msgstr "Gebouw"
@@ -15713,5 +16041,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2049
 msgid "Public Building"
 msgstr "Openbare gebouw"
@@ -15719,10 +16047,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 "Openbare gebouwen bewerken"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2055
 msgid "Town hall"
 msgstr "Stadhuis"
@@ -15730,10 +16058,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 "Stadhuis bewerken"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2061
 msgid "Embassy"
 msgstr "Ambassade"
@@ -15741,10 +16069,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 "Ambassade bewerken"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2066
+#: build/trans_presets.java:2067
 msgid "Courthouse"
 msgstr "Gerechtsgebouw"
@@ -15753,10 +16081,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 "Gerechtsgebouw bewerken"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2074
 msgid "Prison"
 msgstr "Gevangenis"
@@ -15765,10 +16093,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 "Gevangenis bewerken"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2080
+#: build/trans_presets.java:2081
 msgid "Police"
 msgstr "Politie"
@@ -15778,10 +16106,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 "Politie bewerken"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2089
 msgid "Fire Station"
 msgstr "Brandweerkazerne"
@@ -15790,10 +16118,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 "Brandweerkazerne bewerken"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2096
 msgid "Post Office"
 msgstr "Postkantoor"
@@ -15801,5 +16129,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 "Postkantoor bewerken"
@@ -15807,15 +16135,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2103
 msgid "Kindergarten"
 msgstr "Kinderopvang"
 
 #. item
-#: build/trans_presets.java:2103
+#: build/trans_presets.java:2104
 msgid "Edit Kindergarten"
 msgstr "Kinderopvang bewerken"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2108
 msgid "School"
 msgstr "School"
@@ -15823,10 +16151,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 "School bewerken"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2114
 msgid "University"
 msgstr "Universiteit"
@@ -15834,10 +16162,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 "Universiteit bewerken"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2120
 msgid "College"
 msgstr "Campus"
@@ -15845,5 +16173,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 "Campus bewerken"
@@ -15851,5 +16179,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2126
+#: build/trans_presets.java:2127
 msgid "Cinema"
 msgstr "Bioscoop"
@@ -15858,10 +16186,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 "Bioscoop bewerken"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2133
+#: build/trans_presets.java:2134
 msgid "Library"
 msgstr "Bibliotheek"
@@ -15870,10 +16198,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 "Bibliotheek bewerken"
 
 #. item "Buildings/Library" text "Name"
-#: build/trans_presets.java:2140
+#: build/trans_presets.java:2141
 msgid "Arts Centre"
 msgstr "Kunstcentrum"
@@ -15881,10 +16209,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 "Kunstcentrum bewerken"
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2146
+#: build/trans_presets.java:2147
 msgid "Theatre"
 msgstr "Theater"
@@ -15893,10 +16221,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 "Theater bewerken"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2154
 msgid "Place of Worship"
 msgstr "Religieus gebouw"
@@ -15906,5 +16234,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 "Religieus gebouw bewerken"
@@ -15913,6 +16241,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 "Religie"
@@ -15921,66 +16249,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 "Bahai"
 
-#: 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 "Boeddhisme"
 
-#: 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 "Christelijk"
 
-#: 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 "Hindoestaans"
 
-#: 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 "Jain"
 
-#: 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 "Joods"
 
-#: 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 "Moslim"
 
-#: 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 "Spirtualist"
 
-#: 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
-msgid "unitarian"
-msgstr ""
-
-#: build/trans_presets.java:2160 build/trans_presets.java:2881
-#: build/trans_presets.java:2890
-msgid "zoroastrian"
-msgstr ""
-
 #: build/trans_presets.java:2161 build/trans_presets.java:2882
 #: build/trans_presets.java:2891
+msgid "unitarian"
+msgstr ""
+
+#: build/trans_presets.java:2161 build/trans_presets.java:2882
+#: build/trans_presets.java:2891
+msgid "zoroastrian"
+msgstr ""
+
+#: build/trans_presets.java:2162 build/trans_presets.java:2883
+#: build/trans_presets.java:2892
 msgid "Denomination"
 msgstr "Benaming"
@@ -15989,81 +16317,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 "Anglicaan"
 
-#: 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 "Katholiek"
 
-#: 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 "Evangelist"
 
-#: 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 "Jehovahs getuigen"
 
-#: 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 "Luthers"
 
-#: 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 "Methodist"
 
-#: 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 "Orthodox"
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 "Protestant"
 
-#: 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 "Quaker"
 
-#: 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 "Adressen"
@@ -16072,5 +16400,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 "Adresinformatie bewerken"
@@ -16078,5 +16406,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2169
+#: build/trans_presets.java:2170
 msgid "House number"
 msgstr "Huisnummer"
@@ -16084,20 +16412,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2172
 msgid "House name"
 msgstr "Huisnaam"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2174
 msgid "City name"
 msgstr "Stadsnaam"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2174
+#: build/trans_presets.java:2175
 msgid "Post code"
 msgstr "Postcode"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2176
 msgid "Country code"
 msgstr "Landcode"
@@ -16105,5 +16433,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2179
 msgid "Address Interpolation"
 msgstr "Adresinterpolatie"
@@ -16112,5 +16440,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 "Adresinterpolatie bewerken"
@@ -16118,71 +16446,71 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2184
 msgid "Numbering scheme"
 msgstr "Nummeringschema"
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2184
 msgid "odd"
 msgstr "oneven"
 
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2184
 msgid "even"
 msgstr "even"
 
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2184
 msgid "all"
 msgstr "alles"
 
-#: 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 "Bouwwerken"
 
 #. group "Man Made"
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2188
 msgid "Works"
 msgstr "Fabriek"
 
 #. item
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2189
 msgid "Edit Works"
 msgstr "Fabriek bewerken"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2193
 msgid "Tower"
 msgstr "Toren"
 
 #. item
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2194
 msgid "Edit Tower"
 msgstr "Toren bewerken"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2198
 msgid "Water Tower"
 msgstr "Watertoren"
 
 #. item
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2199
 msgid "Edit Water Tower"
 msgstr "Watertoren bewerken"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2203
 msgid "Gasometer"
 msgstr "Olieopslag"
 
 #. item
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2204
 msgid "Edit Gasometer"
 msgstr "Olieopslag bewerken"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2207
+#: build/trans_presets.java:2208
 msgid "Lighthouse"
 msgstr "Vuurtoren"
@@ -16190,10 +16518,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 "Vuurtoren bewerken"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2214
 msgid "Windmill"
 msgstr "Windmolen"
@@ -16201,10 +16529,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 "Windmolen bewerken"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2220
 msgid "Pipeline"
 msgstr "Pijplijn"
@@ -16212,10 +16540,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 "Pijplijn bewerken"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2225
+#: build/trans_presets.java:2226
 msgid "Wastewater Plant"
 msgstr "Afvalzuivering"
@@ -16225,10 +16553,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 "Afvalzuivering bewerken"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2233
+#: build/trans_presets.java:2234
 msgid "Crane"
 msgstr "Kraan"
@@ -16236,10 +16564,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 "Kraan bewerken"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2239
+#: build/trans_presets.java:2240
 msgid "Beacon"
 msgstr "Baken"
@@ -16247,10 +16575,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 "Baken bewerken"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2245
+#: build/trans_presets.java:2246
 msgid "Survey Point"
 msgstr "Uitkijkpunt"
@@ -16258,10 +16586,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 "Uitkijkpunt bewerken"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2252
 msgid "Surveillance"
 msgstr "Bewakingscamera"
@@ -16269,5 +16597,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 "Bewakingscamera bewerken"
@@ -16275,5 +16603,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2258
+#: build/trans_presets.java:2259
 msgid "Power Generator"
 msgstr "Energievoorziening"
@@ -16283,39 +16611,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 "Energievoorziening bewerken"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "wind"
 msgstr "wind"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "hydro"
 msgstr "water"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "fossil"
 msgstr "fossiele brandstoffen"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "nuclear"
 msgstr "nucleair"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "coal"
 msgstr "kolen"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "photovoltaic"
 msgstr "fotovoltage"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "gas"
 msgstr "gas"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2268
 msgid "Power Station"
 msgstr "Krachtcentrale"
@@ -16324,10 +16652,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 "Krachtcentrale bewerken"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2274
+#: build/trans_presets.java:2275
 msgid "Power Sub Station"
 msgstr "Transformatorstation"
@@ -16336,5 +16664,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 "Transformatorstation bewerken"
@@ -16342,10 +16670,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 "Lijnreferentie"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2282
+#: build/trans_presets.java:2283
 msgid "Power Tower"
 msgstr "Hoogspanningsmast"
@@ -16356,5 +16684,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 "Hoogspanningsmast bewerken"
@@ -16362,5 +16690,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 "Hoogspanningskabel"
@@ -16369,25 +16697,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 "Hoogspanningskabels bewerken"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2298
 msgid "Voltage"
 msgstr "Voltage"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2299
 msgid "Amount of Wires"
 msgstr "Hoeveelheid draden"
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2301
+#: build/trans_presets.java:2302
 msgid "Amenities"
 msgstr "Voorzieningen"
 
 #. group "Amenities"
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2303
 msgid "Toilets"
 msgstr "Toiletten"
@@ -16395,20 +16723,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 "Referentienummer"
 
 #. 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 "Opmerking"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2312
 msgid "Post Box"
 msgstr "Postbus"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2317
 msgid "Telephone"
 msgstr "Telefoon"
@@ -16417,5 +16745,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 "Een telefoon bewerken"
@@ -16423,5 +16751,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 "Munten"
@@ -16429,5 +16757,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 "Briefgeld"
@@ -16435,5 +16763,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 "Chipknip"
@@ -16441,5 +16769,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 "Pinpas"
@@ -16447,15 +16775,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 "Creditkaart"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2328
 msgid "Telephone cards"
 msgstr "Telefoonkaart"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2330
 msgid "Recycling"
 msgstr "Recycling"
@@ -16464,5 +16792,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 "Recyclebakken"
@@ -16470,35 +16798,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 "Batterijen"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2336
 msgid "Cans"
 msgstr "Flessen"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2337
 msgid "Clothes"
 msgstr "Kleding"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2338
 msgid "Glass"
 msgstr "Glas"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2339
 msgid "Paper"
 msgstr "Papier"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2340
 msgid "Scrap Metal"
 msgstr "Schroot"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2342
 msgid "Bench"
 msgstr "Bank"
@@ -16507,20 +16835,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 "Vogeluitkijkpost"
 
 #. item
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2347
 msgid "Edit Hunting Stand"
 msgstr "Vogeluitkijkpost bewerken"
 
 #. item "Amenities/Hunting Stand" check "Shelter"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2350
 msgid "Hide"
 msgstr "Verborgen"
 
 #. item "Amenities/Hunting Stand" check "Hide"
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2351
 msgid "Lock"
 msgstr "Afgesloten"
@@ -16528,22 +16856,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 "Hoogte"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2351
+#: build/trans_presets.java:2352
 msgid "low"
 msgstr "Kruiphoogte"
 
-#: build/trans_presets.java:2351
+#: build/trans_presets.java:2352
 msgid "half"
 msgstr "Bukhoogte"
 
-#: build/trans_presets.java:2351
+#: build/trans_presets.java:2352
 msgid "full"
 msgstr "Stahoogte"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2354
 msgid "Fountain"
 msgstr "Fontein"
@@ -16552,10 +16880,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 "Fontein bewerken"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2361
 msgid "Drinking Water"
 msgstr "Drinkwater"
@@ -16564,10 +16892,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 "Drinkwater bewerken"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2367
+#: build/trans_presets.java:2368
 msgid "Baby Hatch"
 msgstr ""
@@ -16575,25 +16903,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 "Winkels"
 
 #. group "Shops"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2377
 msgid "Supermarket"
 msgstr "Supermarkt"
 
 #. item
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2378
 msgid "Edit Supermarket"
 msgstr "Supermarkt bewerken"
 
 #. item "Shops/Supermarket" text "Name"
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:2382
 msgid "Convenience Store"
 msgstr ""
@@ -16601,10 +16929,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"
@@ -16612,10 +16940,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 "Kiosk bewerken"
 
 #. item "Shops/Kiosk" text "Name"
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2394
 msgid "Vending machine"
 msgstr "Verkoopautomaat"
@@ -16623,5 +16951,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 "Verkoopautomaat bewerken"
@@ -16629,88 +16957,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 "Producten"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "public_transport_tickets"
 msgstr "vervoerskaarten"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "public_transport_plans"
 msgstr "overzichtskaart"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "parking_tickets"
 msgstr "parkeerbiljet"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "food"
 msgstr "voedsel"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "drinks"
 msgstr "frisdranken"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "sweets"
 msgstr "snoepgoed"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "cigarettes"
 msgstr "sigaretten"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "photos"
 msgstr "foto's"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "animal_food"
 msgstr "diervoeder"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "news_papers"
 msgstr "kranten"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "toys"
 msgstr "speelgoed"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "stamps"
 msgstr "postzegels"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "SIM-cards"
 msgstr "SIM-kaarten"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "telephone_vouchers"
 msgstr "prepaid-kaarten"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "vouchers"
 msgstr "tegoedbonnen"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "condoms"
 msgstr "condooms"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "tampons"
 msgstr "tampons"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "excrement_bags"
 msgstr "hondenpoepzakjes"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2407
 msgid "Account or loyalty cards"
 msgstr "Klantenkaarten"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2408
+#: build/trans_presets.java:2409
 msgid "Butcher"
 msgstr "Slager"
@@ -16718,10 +17046,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 "Slager bewerken"
 
 #. item "Shops/Butcher" text "Name"
-#: build/trans_presets.java:2414
+#: build/trans_presets.java:2415
 msgid "Baker"
 msgstr "Bakker"
@@ -16729,10 +17057,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 "Bakker bewerken"
 
 #. item "Shops/Baker" text "Name"
-#: build/trans_presets.java:2420
+#: build/trans_presets.java:2421
 msgid "Florist"
 msgstr "Bloemist"
@@ -16740,20 +17068,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 "Bloemist bewerken"
 
 #. 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 ""
@@ -16761,60 +17089,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 "Dranken"
 
 #. 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 "Computer"
 
 #. item
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2444
 msgid "Edit Computer Shop"
 msgstr "Computerwinkel bewerken"
 
 #. item "Shops/Computer" text "Name"
-#: build/trans_presets.java:2447
+#: build/trans_presets.java:2448
 msgid "Electronics"
 msgstr "Elektronica"
 
 #. item
-#: build/trans_presets.java:2448
+#: build/trans_presets.java:2449
 msgid "Edit Electronics Shop"
 msgstr "Elektronicawinkel bewerken"
 
 #. item "Shops/Electronics" text "Name"
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2453
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2454
 msgid "Edit Hifi Shop"
 msgstr "Hifi-winkel bewerken"
 
 #. item "Shops/Hifi" text "Name"
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2458
 msgid "Furniture"
 msgstr "Meubels"
 
 #. item
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2459
 msgid "Edit Furniture Shop"
 msgstr "Meubelzaak bewerken"
 
 #. item "Shops/Furniture" text "Name"
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2463
 msgid "Garden Centre"
 msgstr "Tuincentrum"
@@ -16822,10 +17150,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 "Tuincentrum bewerken"
 
 #. item "Shops/Garden Centre" text "Name"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2469
 msgid "Hardware"
 msgstr ""
@@ -16833,10 +17161,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 ""
 
 #. item "Shops/Hardware" text "Name"
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2475
 msgid "Do-it-yourself-store"
 msgstr "Doe-het-zelfzaak"
@@ -16844,60 +17172,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 "Doe-het-zelfzaak bewerken"
 
 #. item "Shops/Do-it-yourself-store" text "Name"
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2481
 msgid "Stationery"
 msgstr "Kantoorartikelen"
 
 #. item
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2482
 msgid "Edit Stationery Shop"
 msgstr "Kantoorartikelenwinkel bewerken"
 
 #. item "Shops/Stationery" text "Name"
-#: build/trans_presets.java:2485
+#: build/trans_presets.java:2486
 msgid "Hairdresser"
 msgstr "Kapper"
 
 #. item
-#: build/trans_presets.java:2486
+#: build/trans_presets.java:2487
 msgid "Edit Hairdresser"
 msgstr "Kapper bewerken"
 
 #. item "Shops/Hairdresser" text "Name"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2491
 msgid "Shoes"
 msgstr "Schoenen"
 
 #. item
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2492
 msgid "Edit Shoe Shop"
 msgstr "Schoenenwinkel bewerken"
 
 #. item "Shops/Shoes" text "Name"
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2496
 msgid "Toys"
 msgstr "Speelgoed"
 
 #. item
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2497
 msgid "Edit Toy Shop"
 msgstr "Speelgoedwinkel bewerken"
 
 #. item "Shops/Toys" text "Name"
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2501
 msgid "Video"
 msgstr "Videotheek"
 
 #. item
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2502
 msgid "Edit Video Shop"
 msgstr "Videotheek bewerken"
 
 #. item "Shops/Video" text "Name"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2506
 msgid "Dry Cleaning"
 msgstr "Stomerij"
@@ -16905,10 +17233,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 "Stomerij bewerken"
 
 #. item "Shops/Dry Cleaning" text "Name"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2512
 msgid "Laundry"
 msgstr "Wasserette"
@@ -16916,10 +17244,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 "Wasserette bewerken"
 
 #. item "Shops/Laundry" text "Name"
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2518
 msgid "Outdoor"
 msgstr "Buitensport"
@@ -16927,35 +17255,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 "Buitensportzaak bewerken"
 
 #. item "Shops/Outdoor" text "Name"
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2524
 msgid "Sports"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2525
 msgid "Edit Sports Shop"
 msgstr "Sportzaak bewerken"
 
 #. item "Shops/Sports" text "Name"
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2529
 msgid "Optician"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2530
 msgid "Edit Optician"
 msgstr "Opticiën bewerken"
 
 #. item "Shops/Optician" text "Name"
-#: build/trans_presets.java:2535
+#: build/trans_presets.java:2536
 msgid "Cash"
 msgstr "Geldzaken"
 
 #. group "Cash"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2537
 msgid "Bank"
 msgstr "Bank"
@@ -16963,5 +17291,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 "Bank bewerken"
@@ -16969,10 +17297,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 "Geldautomaat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2544
 msgid "Money Exchange"
 msgstr "Geldwisselkantoor"
@@ -16980,5 +17308,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 "Geldwisselkantoor bewerken"
@@ -16986,15 +17314,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 "Geldautomaat bewerken"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2557
 msgid "Health"
 msgstr "Gezondheid"
 
 #. group "Health"
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2558
 msgid "Doctors"
 msgstr "Huisarts"
@@ -17002,20 +17330,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 "Huisarts bewerken"
 
 #. item "Health/Doctors" text "Name"
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2564
 msgid "Dentist"
 msgstr "Tandarts"
 
 #. item
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2565
 msgid "Edit Dentist"
 msgstr "Tandarts bewerken"
 
 #. item "Health/Dentist" text "Name"
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2569
 msgid "Pharmacy"
 msgstr "Apotheek"
@@ -17023,5 +17351,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 "Apotheek bewerken"
@@ -17029,10 +17357,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 ""
 
 #. item "Health/Pharmacy" text "Name"
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2576
 msgid "Hospital"
 msgstr "Ziekenhuis"
@@ -17040,10 +17368,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 "Ziekenhuis bewerken"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2582
 msgid "Emergency Access Point"
 msgstr "EHBO-post"
@@ -17052,5 +17380,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 "EHBO-post bewerken"
@@ -17059,20 +17387,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2588
 msgid "Point Number"
 msgstr "Puntnummer"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2589
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2591
 msgid "Phone Number"
 msgstr "Telefoonnummer"
 
 #. 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 "(Gebruik de landtoegangscode, b.v. +31 20-3456789)"
@@ -17080,5 +17408,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 "Dierenarts"
@@ -17087,25 +17415,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 "Dierenarts bewerken"
 
 #. group "Places"
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2605
 msgid "Continent"
 msgstr "Continent"
 
 #. item
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2606
 msgid "Edit Continent"
 msgstr "Een continent bewerken"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2611
 msgid "Country"
 msgstr "Land"
 
 #. item
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2612
 msgid "Edit Country"
 msgstr "Land bewerken"
@@ -17113,30 +17441,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 "Provincie"
 
 #. item
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2618
 msgid "Edit State"
 msgstr "Provincie bewerken"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2622
+#: build/trans_presets.java:2623
 msgid "Region"
 msgstr "Regio"
 
 #. item
-#: build/trans_presets.java:2623
+#: build/trans_presets.java:2624
 msgid "Edit Region"
 msgstr "Regio bewerken"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2628
+#: build/trans_presets.java:2629
 msgid "County"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2629
+#: build/trans_presets.java:2630
 msgid "Edit County"
 msgstr ""
@@ -17144,15 +17472,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2635
+#: build/trans_presets.java:2636
 msgid "City"
 msgstr "Stad"
 
 #. item
-#: build/trans_presets.java:2636
+#: build/trans_presets.java:2637
 msgid "Edit City"
 msgstr "Stad bewerken"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2641
+#: build/trans_presets.java:2642
 msgid "Town"
 msgstr "Dorp"
@@ -17160,10 +17488,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 "Dorp bewerken"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2649
 msgid "Suburb"
 msgstr "Deelgemeente"
@@ -17171,25 +17499,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 "Deelgemeente bewerken"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2656
 msgid "Village"
 msgstr "Klein dorp"
 
 #. item
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2657
 msgid "Edit Village"
 msgstr "Klein dorp bewerken"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2662
 msgid "Hamlet"
 msgstr "Gehucht"
 
 #. item
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2663
 msgid "Edit Hamlet"
 msgstr "Gehucht bewerken"
@@ -17197,5 +17525,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2669
 msgid "Locality"
 msgstr ""
@@ -17203,10 +17531,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 ""
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2676
 msgid "Island"
 msgstr "Eiland"
@@ -17214,5 +17542,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 "Eiland bewerken"
@@ -17220,5 +17548,5 @@
 #. item "Places/Island" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2683
+#: build/trans_presets.java:2684
 msgid "Cave Entrance"
 msgstr "Grotingang"
@@ -17226,10 +17554,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 "Grotingang bewerken"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2690
 msgid "Peak"
 msgstr "Bergtop"
@@ -17237,10 +17565,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 "Bergtop bewerken"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2697
 msgid "Glacier"
 msgstr "Gletsjer"
@@ -17248,10 +17576,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 "Gletsjer bewerken"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2703
+#: build/trans_presets.java:2704
 msgid "Volcano"
 msgstr "Vulkaan"
@@ -17259,70 +17587,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 "Vulkaan bewerken"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2711
+#: build/trans_presets.java:2712
 msgid "Boundaries"
 msgstr "Grenzen"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2713
 msgid "National"
 msgstr "Landsgrens"
 
 #. item
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2714
 msgid "Edit National Boundary"
 msgstr "Landsgrens bewerken"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2718
+#: build/trans_presets.java:2719
 msgid "Administrative"
 msgstr "Provincie -of gemeentegrens"
 
 #. item
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2720
 msgid "Edit Administrative Boundary"
 msgstr "Provincie -of gemeentegrens bewerken"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2724
+#: build/trans_presets.java:2725
 msgid "Civil"
 msgstr "Grens bebouwde kom"
 
 #. item
-#: build/trans_presets.java:2725
+#: build/trans_presets.java:2726
 msgid "Edit Civil Boundary"
 msgstr "Grens bebouwde kom bewerken"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2730
+#: build/trans_presets.java:2731
 msgid "Political"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:2732
 msgid "Edit Political Boundary"
 msgstr "Grens kiesdistrict bewerken"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2736
+#: build/trans_presets.java:2737
 msgid "National park"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2737
+#: build/trans_presets.java:2738
 msgid "Edit National Park Boundary"
 msgstr "Grens Nationaal park bewerken"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2744
 msgid "Land use"
 msgstr "Grondgebruik"
 
 #. group "Land use"
-#: build/trans_presets.java:2744
+#: build/trans_presets.java:2745
 msgid "Tree"
 msgstr "Boom"
@@ -17331,15 +17659,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 "Boom bewerken"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2753
 msgid "Botanical Name"
 msgstr "Botanische naam"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2755
 msgid "Wood"
 msgstr "Bos"
@@ -17348,5 +17676,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 "Bos bewerken"
@@ -17354,17 +17682,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 "naaldbomen"
 
-#: build/trans_presets.java:2760 build/trans_presets.java:2769
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
 msgid "deciduous"
 msgstr "loofbomen"
 
-#: build/trans_presets.java:2760 build/trans_presets.java:2769
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
 msgid "mixed"
 msgstr "gemengd"
 
-#: build/trans_presets.java:2762
+#: build/trans_presets.java:2763
 msgid "Forest"
 msgstr "Bosbouw"
@@ -17373,14 +17701,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 "Bosbouw bewerken"
 
-#: build/trans_presets.java:2771
+#: build/trans_presets.java:2772
 msgid "Nature Reserve"
 msgstr "Natuurreservaat"
 
 #. item
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2773
 msgid "Edit Nature Reserve"
 msgstr "Natuurreservaat bewerken"
@@ -17388,25 +17716,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2777
+#: build/trans_presets.java:2778
 msgid "Scree"
 msgstr "Puinhelling"
 
 #. item
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:2779
 msgid "Edit Scree"
 msgstr "Puinhelling bewerken"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2783
 msgid "Scrub"
 msgstr "Kreupelhout"
 
 #. item
-#: build/trans_presets.java:2783
+#: build/trans_presets.java:2784
 msgid "Edit Scrub"
 msgstr "Kreupelhout bewerken"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2788
 msgid "Fell"
 msgstr ""
@@ -17414,10 +17742,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 ""
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2794
 msgid "Heath"
 msgstr "Heide"
@@ -17425,5 +17753,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 "Heide bewerken"
@@ -17431,5 +17759,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2801
 msgid "Farmyard"
 msgstr "Boerenerf"
@@ -17438,45 +17766,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 "Boerenerf bewerken"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2808
+#: build/trans_presets.java:2809
 msgid "Farmland"
 msgstr "Landbouwgrond"
 
 #. item
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2810
 msgid "Edit Farmland Landuse"
 msgstr "Landbouwgrond bewerken"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2814
+#: build/trans_presets.java:2815
 msgid "Meadow"
 msgstr "Weide"
 
 #. item
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2816
 msgid "Edit Meadow Landuse"
 msgstr "Weideland bewerken"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2820
+#: build/trans_presets.java:2821
 msgid "Vineyard"
 msgstr "Wijngaard"
 
 #. item
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2822
 msgid "Edit Vineyard Landuse"
 msgstr "Wijngaard bewerken"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2826
+#: build/trans_presets.java:2827
 msgid "Allotments"
 msgstr "Volkstuinen"
 
 #. item
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:2828
 msgid "Edit Allotments Landuse"
 msgstr "Volkstuinen bewerken"
@@ -17484,25 +17812,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2833
+#: build/trans_presets.java:2834
 msgid "Garden"
 msgstr "Tuin"
 
 #. item
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2835
 msgid "Edit Garden"
 msgstr "Tuin bewerken"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2838
+#: build/trans_presets.java:2839
 msgid "Grass"
 msgstr "Gras"
 
 #. item
-#: build/trans_presets.java:2839
+#: build/trans_presets.java:2840
 msgid "Edit Grass Landuse"
 msgstr "Gras bewerken"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2845
 msgid "Village Green"
 msgstr "Stadsgroen"
@@ -17510,10 +17838,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 "Stadsgroen bewerken"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:2852
 msgid "Common"
 msgstr "Algemeen"
@@ -17521,20 +17849,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 "Algemeen bewerken"
 
 #. 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 "Park bewerken"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2863
 msgid "Recreation Ground"
 msgstr "Recreatiegebied"
@@ -17542,5 +17870,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 "Recreatiegebied bewerken"
@@ -17548,15 +17876,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2871
 msgid "Residential area"
 msgstr "Woongebied"
 
 #. item
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2872
 msgid "Edit Residential Landuse"
 msgstr "Woongebied bewerken"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2877
 msgid "Graveyard"
 msgstr "Begraafplaats"
@@ -17564,9 +17892,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 "Begraafplaats bewerken"
 
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:2885
 msgid "Cemetery"
 msgstr "Begraafplaats"
@@ -17574,39 +17902,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 "Begraafplaats bewerken"
 
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2894
 msgid "Retail"
 msgstr "Winkelcentrum"
 
 #. item
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2895
 msgid "Edit Retail Landuse"
 msgstr "Winkelcentrum bewerken"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2900
 msgid "Commercial"
 msgstr "Kantoren"
 
 #. item
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2901
 msgid "Edit Commercial Landuse"
 msgstr "Kantoren bewerken"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2906
 msgid "Industrial"
 msgstr "Industrieterrein"
 
 #. item
-#: build/trans_presets.java:2906
+#: build/trans_presets.java:2907
 msgid "Edit Industrial Landuse"
 msgstr "Industrieterrein bewerken"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2912
 msgid "Railway land"
 msgstr ""
@@ -17614,15 +17942,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 ""
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:2919
 msgid "Military"
 msgstr "Militair terrein"
 
 #. item
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2920
 msgid "Edit Military Landuse"
 msgstr "Militair terrein bewerken"
@@ -17630,55 +17958,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2925
+#: build/trans_presets.java:2926
 msgid "Construction area"
 msgstr "Bouwterrein"
 
 #. item
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2927
 msgid "Edit Construction Landuse"
 msgstr "Bouwterrein bewerken"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2932
 msgid "Brownfield"
 msgstr "Braakliggende grond"
 
 #. item
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:2933
 msgid "Edit Brownfield Landuse"
 msgstr "Braakliggende grond bewerken"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2937
+#: build/trans_presets.java:2938
 msgid "Greenfield"
 msgstr "Ontwikkelingsgebied"
 
 #. item
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:2939
 msgid "Edit Greenfield Landuse"
 msgstr "Ontwikkelingsgebied bewerken"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:2944
 msgid "Landfill"
 msgstr "Vuilstortplaats"
 
 #. item
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:2945
 msgid "Edit Landfill Landuse"
 msgstr "Vuilstortplaats bewerken"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2950
 msgid "Quarry"
 msgstr "Mijnbouw"
 
 #. item
-#: build/trans_presets.java:2950
+#: build/trans_presets.java:2951
 msgid "Edit Quarry Landuse"
 msgstr "Mijnbouw bewerken"
 
 #. group "Relations"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2960
 msgid "Multipolygon"
 msgstr "Multipolygoon"
@@ -17688,5 +18016,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 "Multipolygoon bewerken"
@@ -17695,10 +18023,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:2970
 msgid "outer segment"
 msgstr "buitensegment"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:2970
+#: build/trans_presets.java:2971
 msgid "inner segment"
 msgstr "binnensegment"
@@ -17706,5 +18034,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:2974
 msgid "Turn restriction"
 msgstr "Verkeersbeperking"
@@ -17713,5 +18041,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 "Verkeersbeperking bewerken"
@@ -17719,34 +18047,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 "Beperking"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_left_turn"
 msgstr "niet linksaf"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_right_turn"
 msgstr "niet rechtsaf"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_straight_on"
 msgstr "niet rechtdoor"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_u_turn"
 msgstr "niet keren"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "only_right_turn"
 msgstr "alleen rechtsaf"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "only_left_turn"
 msgstr "alleen linksaf"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "only_straight_on"
 msgstr "alleen rechtdoor"
@@ -17755,15 +18083,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2983
+#: build/trans_presets.java:2984
 msgid "from way"
 msgstr "vanaf weg"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2985
 msgid "via node or way"
 msgstr "via knoop of weg"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2986
 msgid "to way"
 msgstr "naar weg"
@@ -17771,5 +18099,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:2988
+#: build/trans_presets.java:2989
 msgid "Route"
 msgstr ""
@@ -17778,5 +18106,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 ""
@@ -17784,5 +18112,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 ""
@@ -17854,5 +18182,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
@@ -17861,17 +18189,17 @@
 msgstr "fiets"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "bus"
 msgstr "bus"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "ski"
 msgstr ""
@@ -17924,5 +18252,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
@@ -17931,13 +18259,13 @@
 msgstr "voet"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "hiking"
 msgstr ""
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "detour"
 msgstr ""
@@ -17951,10 +18279,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 "metro"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:2997
 msgid "Symbol description"
 msgstr ""
@@ -17962,26 +18290,26 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:2999
+#: build/trans_presets.java:3000
 msgid "Network"
 msgstr ""
 
 #. item "Relations/Route" combo "State"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3003
 msgid "Color (hex)"
 msgstr ""
@@ -17990,30 +18318,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:3006
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3007
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3008
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3009
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3010
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3011
 msgid "backward halt point"
 msgstr ""
@@ -22128,7 +22456,19 @@
 msgstr ""
 
+#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
+#~ msgstr "Je kunt met de muis of CTRL+pijltoetsen zoomen en verplaatsen."
+
 #~ msgid "Uploading data"
 #~ msgstr "Gegevens uploaden"
 
+#~ msgid "Email"
+#~ msgstr "E-mail"
+
+#~ msgid "Login name (email) to the OSM account."
+#~ msgstr "Loginnaam (e-mail) van het OSM-account."
+
+#~ msgid "OSM username (email)"
+#~ msgstr "OSM-gebruikersnaam (e-mail)"
+
 #~ msgid "Unknown host"
 #~ msgstr "Onbekende host"
@@ -22136,4 +22476,11 @@
 #~ msgid "Add either site-josm.xml or Wiki Pages."
 #~ msgstr "site-josm.xml of Wiki-paginas toevoegen."
+
+#~ msgid ""
+#~ "Server returned internal error. Try a reduced area or retry after waiting "
+#~ "some time."
+#~ msgstr ""
+#~ "Server antwoordde met interne fout. Verklein het gebied of probeer het "
+#~ "later nog eens."
 
 #~ msgid "Commit comment"
@@ -22191,7 +22538,67 @@
 #~ msgstr "Dit onderwerp zeker als ''uitgevoerd'' markeren?"
 
+#~ 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 URL.<br><b>Do not use a valuable Password.</b></html>"
+#~ msgstr ""
+#~ "<html>WAARSCHUWING: het wachtwoord wordt als gewone tekst in het "
+#~ "voorkeurenbestand opgeslagen<br>en ook als gewone tekst naar de server "
+#~ "verzonden, verwerkt in de URL.<br><b>Gebruik dus geen waardevol "
+#~ "wachtwoord.</b></html>"
+
 #~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS"
 #~ msgstr ""
 #~ "Geogerefereerde afbeelding van Metacarta's Map Rectifier WMS downloaden"
+
+#~ msgid ""
+#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab "
+#~ "- these will then show up in the WMS menu.\n"
+#~ "\n"
+#~ "You can also do this manually in the Advanced Preferences, using the "
+#~ "following schema:\n"
+#~ "wmsplugin.url.1.name=Landsat\n"
+#~ "wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n"
+#~ "wmsplugin.url.2.name=NPE Maps... etc\n"
+#~ "\n"
+#~ "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"
+#~ "\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"
+#~ "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"
+#~ "Note: Make sure the image is suitable, copyright-wise, if in doubt, don't "
+#~ "use."
+#~ msgstr ""
+#~ "Je kunt WMS-invoer in het tabblad WMSplugin-voorkeuren toevoegen, "
+#~ "bewerken en wissen - deze zullen in het WMS-menu getoond worden.\n"
+#~ "\n"
+#~ "Je kunt dit ook handmatig doen in de Uitgebreide voorkeuren, "
+#~ "gebruikmakend van het volgende schema:\n"
+#~ "wmsplugin.url.1.name=Landsat\n"
+#~ "wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n"
+#~ "wmsplugin.url.2.name=NPE Maps... enzovoort\n"
+#~ "\n"
+#~ "Volledig voorbeeld van een WMS-URL (landsat)\n"
+#~ "http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n"
+#~ "layers=global_mosaic&styles=&srs=EPSG:4326&\n"
+#~ "format=image/jpeg \n"
+#~ "\n"
+#~ "Voor de Metacarta's Map Rectifier (http://labs.metacarta.com/rectifier/) "
+#~ "moet je de betreffende 'id' invoeren.\n"
+#~ "Om een  menuitem van Metacarta Map Rectifier toe te voegen, maak je een "
+#~ "URL volgens het volgende voorbeeld, waarbij 73 vervangen wordt door je "
+#~ "eigen afbeeldings-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"
+#~ "Merk op: Weet zeker dat de afbeelding vrij is van copyrights. Bij "
+#~ "twijfel: niet gebruiken."
 
 #~ msgid "Portcullis"
@@ -22218,4 +22625,8 @@
 #~ msgstr "viaduct"
 
+#~ msgid "Open the OpenStreetBugs window and activate the automatic download"
+#~ msgstr ""
+#~ "Opent het OpenStreetBugs-scherm en activeert de automatische download"
+
 #~ msgid "The projection could not be read from preferences. Using EPSG:4326"
 #~ msgstr "De projectie staat niet in de voorkeuren. EPSG:4326 wordt gebruikt."
@@ -22224,7 +22635,32 @@
 #~ msgstr "Sportartikelen"
 
+#~ msgid ""
+#~ "Lambert zone {0} in cache  incompatible with current Lambert zone {1}"
+#~ msgstr ""
+#~ "Lambert-zone {0} in buffer is niet compatibel met huidige Lambert-zone {1}"
+
 #~ msgid "Delete and Download"
 #~ msgstr "Verwijder en download"
 
+#~ msgid "No intersections found. Nothing was changed."
+#~ msgstr "Geen doorsnijdingen gevolgende. Er is niets veranderd."
+
+#~ msgid ""
+#~ "This action will require {0} individual download requests. Do you wish to "
+#~ "continue?"
+#~ msgstr ""
+#~ "Deze opdracht zal {0} individuele downloadverzoeken vereisen. Toch "
+#~ "doorgaan?"
+
+#~ msgid ""
+#~ "An error occured while trying to match the photos to the GPX track. You "
+#~ "can adjust the sliders to manually match the photos."
+#~ msgstr ""
+#~ "Het koppelen van de foto's aan de GPX-track is mislukt. Je kunt de "
+#~ "schuifbalken handmatig aanpassen zodat ze met de foto's overeenkomen."
+
+#~ msgid "The following errors occured during mass download:"
+#~ msgstr "Tijdens bulkdownload traden de volgende fouten op:"
+
 #~ msgid "Edit Drawbridge"
 #~ msgstr "Kabelbrug bewerken"
@@ -22232,2 +22668,5 @@
 #~ msgid "Edit Portcullis"
 #~ msgstr "Valhek bewerken"
+
+#~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">english</A>."
+#~ msgstr "Help-pagina ontbreekt. Maak het in <A HREF=\"{0}\">nederlands</A>."
Index: applications/editors/josm/i18n/po/pl.po
===================================================================
--- applications/editors/josm/i18n/po/pl.po	(revision 16008)
+++ applications/editors/josm/i18n/po/pl.po	(revision 16009)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-14 16:51+0200\n"
-"PO-Revision-Date: 2009-05-18 15:54+0000\n"
-"Last-Translator: Łukasz Jernaś <deejay1@srem.org>\n"
+"POT-Creation-Date: 2009-06-19 21:52+0200\n"
+"PO-Revision-Date: 2009-06-16 08:17+0000\n"
+"Last-Translator: Łukasz Cieśnik <lukasz.ciesnik@gmail.com>\n"
 "Language-Team: Polish <josm-lang-pl@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
@@ -17,5 +17,5 @@
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2009-06-14 14:45+0000\n"
+"X-Launchpad-Export-Date: 2009-06-19 19:32+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: POLAND\n"
@@ -31,11 +31,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 "Pomoc"
 
 #: ../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 ""
 
@@ -75,6 +75,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
@@ -91,8 +93,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
@@ -141,5 +143,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"
@@ -542,5 +544,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}"
@@ -612,6 +614,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:92
-msgid "Email"
-msgstr "E-mail"
+msgid "E-Mail"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:96
@@ -649,12 +651,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
@@ -681,5 +685,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
@@ -712,16 +716,13 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:207
 #, java-format
-msgid "Helppage missing. Create it in <A HREF=\"{0}\">english</A>."
-msgstr ""
-"Brak strony pomocy. Możesz ją utworzyć po <a href=\"{0}\">angielsku</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 ""
-"Brak strony pomocy. Możesz ją utworzyć po <a href=\"{0}\">angielsku</a> lub "
-"<A HREF=\"{1}\">po polsku</A>."
 
 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:26
@@ -801,13 +802,13 @@
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:70
 msgid "Mirror"
-msgstr ""
+msgstr "Odbicie lustrzane"
 
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 msgid "Mirror selected nodes and ways."
-msgstr ""
+msgstr "Odwraca zaznoczone węzły i drogi."
 
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53
 msgid "Please select at least one node or way."
-msgstr ""
+msgstr "Wybierz co najmniej jeden węzeł lub drogę."
 
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36
@@ -1096,5 +1097,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112
 msgid "Save Layer"
-msgstr ""
+msgstr "Zapisz warstwę"
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:122
@@ -1153,13 +1154,13 @@
 msgstr "Pomoc: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:99
 msgid "Status Report"
 msgstr "Raport konfiguracji"
 
-#: ../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 "Skopiuj do schowka i zamknij"
 
-#: ../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
@@ -1355,16 +1356,14 @@
 msgstr "Odznacz wszystko (anulowanie)"
 
-#: ../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 "Zaktualizuj dane"
 
-#: ../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 "Aktualizuje bieżącą warstwę danych z serwera (ponownie pobiera dane)"
 
-#: ../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?"
@@ -1373,86 +1372,258 @@
 "jakakolwiek warstwa danych?"
 
-#: ../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 "Ta akcja wymaga wykonania {0} pobrań danych. Kontynuować?"
-
-#: ../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 "Wyślij do OSM..."
 
-#: ../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 "Wysyła wszystkie zmiany na serwer OSM."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:96
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:94
 msgid "Objects to add:"
 msgstr "Obiekty do dodania:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102
 msgid "Objects to modify:"
 msgstr "Obiekty do zmiany:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:110
 msgid "Objects to delete:"
 msgstr "Obiekty do usunięcia:"
 
-#: ../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 "Dołącz krótki opis zmian, które wysyłasz do serwera:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:126
 msgid "Upload these changes?"
 msgstr "Czy wysłać te zmiany?"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:130
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
 msgid "Upload Changes"
 msgstr "Wyślij zmiany"
 
-#: ../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 "Nie ma nic do wysłania. Wprowadź jakieś dane."
 
-#: ../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 "Istnieją nierozwiązane konflikty. Musisz je najpierw rozwiązać."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:182
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:180
 msgid "No changes to upload."
 msgstr "Brak zmian do wysłania."
 
-#: ../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
+msgstr "Wysyłanie"
+
+#: ../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 ""
@@ -1557,37 +1728,51 @@
 msgstr "czyste dane GPS"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:44
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:46
 msgid "Downloading data"
 msgstr "Pobieranie danych"
 
-#: ../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 "Nie zaimportowano danych."
 
-#: ../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 "Warstwa danych {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 "dane OpenSteetMap"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:37
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:45
 msgid "Data Layer"
 msgstr "Warstwa danych"
 
-#: ../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 "Pobieranie {0} z {1} (pozostało: {2})"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:88
-msgid "The following errors occured during mass download:"
-msgstr "Podczas pobierania wystąpiły następujące błędy:"
-
-#: ../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 "Błędy podczas pobierania"
+
+#: ../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
@@ -1640,34 +1825,34 @@
 msgstr "Nie można dodać węzła poza granicami świata."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:495
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:493
 msgid "Add node"
 msgstr "Dodaj węzeł"
 
-#: ../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 "Dodaj węzeł do drogi"
 
-#: ../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 "Połącz istniejący drogę z węzłem"
 
-#: ../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 "Dodaj nowy węzeł do istniejącej drogi"
 
-#: ../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 ""
 
-#: ../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 "Utwórz nowy węzeł."
 
-#: ../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 "Zaznacz węzeł pod kursorem."
 
-#: ../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."
@@ -1676,14 +1861,14 @@
 msgstr[1] ""
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:897
+msgid "Start new way from last node."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:899
-msgid "Start new way from last node."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:901
 msgid "Continue way from last node."
 msgstr ""
 
-#: ../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 "Zakończ rysowanie."
@@ -1998,26 +2183,32 @@
 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 "Załaduj zaznaczenie"
 
-#: ../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 "Kontakt {0}..."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:45
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:46
 msgid "Downloading..."
 msgstr "Pobieranie..."
 
-#: ../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 "Nie można odczytać \"{0}\""
 
-#: ../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 "Błąd przetwarzania adresu URL: \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:74
+msgid "Error while communicating with server."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67
@@ -2079,13 +2270,78 @@
 msgstr "Rozwiąż {0} konfliktów w {1} obiektach"
 
-#: ../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 "Usuń {1} {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97
+#, java-format
+msgid "Delete {0} {1}"
+msgstr "Usuń {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153
+msgid "Conflicting relation"
+msgstr "Sprzeczne relacje"
+
+#: ../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 "Usuń z relacji"
+
+#: ../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 "Rozdziel segmenty drogi"
+
+#. 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 "Przenieś"
+
 #: ../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"
@@ -2095,10 +2351,219 @@
 msgstr[2] "węzłów"
 
-#: ../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 "Obrót"
+
+#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88
+msgid "Sequence"
+msgstr "Sekwencja"
+
+#: ../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 "Zastosować?"
+
+#: ../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 ""
+"Podczas odwracania kierunku drogi następujące właściwości drogi oraz jej "
+"węzłów powinny zostać uwzględniony aby zachować spójność."
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28
+msgid "Relation"
+msgstr "Relacja"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30
+msgid "Old role"
+msgstr "Poprzednia rola"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:32
+msgid "New role"
+msgstr "Nowa rola"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
+msgid "Old key"
+msgstr "Stary klucz"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
+msgid "Old value"
+msgstr "Stara wartość"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
+msgid "New key"
+msgstr "Nowy klucz"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
+msgid "New value"
+msgstr "Nowa wartość"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:40
+msgid "Apply selected changes"
+msgstr "Zastosuj wybrane zmiany"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41
+msgid "Don't apply changes"
+msgstr "Porzuć zmiany"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:83
+msgid "Please select which property changes you want to apply."
+msgstr "Wybierz, które właściwości chcesz zmienić."
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:96
+msgid "Properties of "
+msgstr "Właściwości "
+
+#: ../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 "Automatyczna korekcja tagów"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:314
+#, java-format
+msgid "Malformed config file at lines {0}"
+msgstr "Błąd w pliku konfiguracyjnym w linii {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:324
+#, java-format
+msgid "Cannot open preferences directory: {0}"
+msgstr ""
+
+#: ../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 "Preferencje zostały zapisane na {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:82
+#, java-format
+msgid "Could not upload preferences. Reason: {0}"
+msgstr "Wysłanie preferencji nie powiodło się. Powód: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:93
+msgid "Could not load preferences from server."
+msgstr "Pobranie preferencji z serwera nie powiodło się."
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:34
+msgid "different"
+msgstr "różne"
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:262
+msgid "deleted"
+msgstr "usunięto"
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
+msgid "true"
+msgstr "prawda"
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
+msgid "false"
+msgstr "fałsz"
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20
+msgid "position"
+msgstr "pozycja"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30
+msgid "Decimal Degrees"
+msgstr "Stopnie dziesiętne"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
+msgid "Degrees Minutes Seconds"
+msgstr "Stopnie minuty sekundy"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+msgid "S"
+msgstr "S"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+msgid "N"
+msgstr "N"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+msgid "W"
+msgstr "W"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+msgid "E"
+msgstr "E"
+
+#: ../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 "niekompletne"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
+#, java-format
+msgid "Error: {0}"
+msgstr "Błąd: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
+#, java-format
+msgid "Warning: {0}"
+msgstr "Uwaga: {0}"
+
+#: ../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"
@@ -2108,8 +2573,10 @@
 msgstr[2] "dróg"
 
-#: ../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
@@ -2121,258 +2588,27 @@
 msgstr[2] "relacji"
 
-#: ../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 "Usuń {1} {0}"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97
-#, java-format
-msgid "Delete {0} {1}"
-msgstr "Usuń {0} {1}"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153
-msgid "Conflicting relation"
-msgstr "Sprzeczne relacje"
-
-#: ../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 "Usuń z relacji"
-
-#: ../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 "Rozdziel segmenty drogi"
-
-#. 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 "Przenieś"
-
-#: ../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 "Obrót"
-
-#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88
-msgid "Sequence"
-msgstr "Sekwencja"
-
-#: ../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 "Zastosować?"
-
-#: ../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 ""
-"Podczas odwracania kierunku drogi następujące właściwości drogi oraz jej "
-"węzłów powinny zostać uwzględniony aby zachować spójność."
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28
-msgid "Relation"
-msgstr "Relacja"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30
-msgid "Old role"
-msgstr "Poprzednia rola"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:32
-msgid "New role"
-msgstr "Nowa rola"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
-msgid "Old key"
-msgstr "Stary klucz"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
-msgid "Old value"
-msgstr "Stara wartość"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
-msgid "New key"
-msgstr "Nowy klucz"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
-msgid "New value"
-msgstr "Nowa wartość"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:40
-msgid "Apply selected changes"
-msgstr "Zastosuj wybrane zmiany"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41
-msgid "Don't apply changes"
-msgstr "Porzuć zmiany"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:83
-msgid "Please select which property changes you want to apply."
-msgstr "Wybierz, które właściwości chcesz zmienić."
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:96
-msgid "Properties of "
-msgstr "Właściwości "
-
-#: ../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 "Automatyczna korekcja tagów"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:314
-#, java-format
-msgid "Malformed config file at lines {0}"
-msgstr "Błąd w pliku konfiguracyjnym w linii {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:324
-#, java-format
-msgid "Cannot open preferences directory: {0}"
-msgstr ""
-
-#: ../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 "Preferencje zostały zapisane na {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:82
-#, java-format
-msgid "Could not upload preferences. Reason: {0}"
-msgstr "Wysłanie preferencji nie powiodło się. Powód: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:93
-msgid "Could not load preferences from server."
-msgstr "Pobranie preferencji z serwera nie powiodło się."
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:34
-msgid "different"
-msgstr "różne"
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:262
-msgid "deleted"
-msgstr "usunięto"
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
-msgid "true"
-msgstr "prawda"
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
-msgid "false"
-msgstr "fałsz"
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20
-msgid "position"
-msgstr "pozycja"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30
-msgid "Decimal Degrees"
-msgstr "Stopnie dziesiętne"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
-msgid "Degrees Minutes Seconds"
-msgstr "Stopnie minuty sekundy"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
-msgid "S"
-msgstr "S"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
-msgid "N"
-msgstr "N"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
-msgid "W"
-msgstr "W"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
-msgid "E"
-msgstr "E"
-
-#: ../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 "niekompletne"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
-#, java-format
-msgid "Error: {0}"
-msgstr "Błąd: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
-#, java-format
-msgid "Warning: {0}"
-msgstr "Uwaga: {0}"
-
-#: ../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"
@@ -2387,5 +2623,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:122
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "railway"
 msgstr "tory kolejowe"
@@ -2408,4 +2644,62 @@
 msgstr[2] "{0} węzłów"
 
+#: ../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."
@@ -2553,5 +2847,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 "tło"
@@ -2629,8 +2923,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
@@ -2642,7 +2936,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
@@ -2744,10 +3038,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 "Nazwa użytkownika"
 
 #: ../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 "Hasło"
@@ -2842,22 +3136,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:146
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148
 msgid "File"
 msgstr "Plik"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150
 msgid "View"
 msgstr "Widok"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:149
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151
 msgid "Tools"
 msgstr "Narzędzia"
 
-#: ../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 "Szablony"
 
-#: ../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
@@ -2870,21 +3164,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 "Widok szkieletowy"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:218
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221
 msgid "Toggle Wireframe view"
 msgstr "Przełącza widok szkieletowy"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:244
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:247
 msgid "Full Screen"
 msgstr "Pełny ekran"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:246
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:249
 msgid "Toggle Full Screen view"
 msgstr "Przełącza widok na pełen ekran"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:286
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:289
 msgid "Audio"
 msgstr "Dźwięk"
@@ -2956,6 +3250,6 @@
 msgstr "(brak obiektu)"
 
-#: ../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 "warstwa nie jest na liście."
@@ -2965,9 +3259,9 @@
 msgstr "Nawiązywanie połączenia z serwerem OSM..."
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:104
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:105
 msgid "Error while parsing"
 msgstr "Błąd podczas przetwarzania"
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:107
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:108
 msgid "File not found"
 msgstr "Plik nie został odnaleziony"
@@ -3039,5 +3333,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 "Członkowie"
@@ -3233,5 +3527,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
@@ -3313,5 +3607,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 ""
@@ -3350,5 +3644,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 ""
 
@@ -3402,5 +3696,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 "Rola"
@@ -3504,5 +3798,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
@@ -3815,5 +4109,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 "Relacje"
@@ -3921,66 +4215,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 "Zastosuj zmiany"
 
-#: ../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 "Podstawowe"
 
-#: ../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 "Zajęte przez"
 
-#: ../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 "Etykiety (ustawienie wartości na pustą usuwa etykietę)"
 
-#: ../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 "Przesuń w górę"
 
-#: ../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 "Przesuń aktualnie zaznaczonych członkół w górę"
 
-#: ../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 "Dodaj zaznaczone"
 
-#: ../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 "Dodaj wszystkie obecnie zaznaczone obiekty jako członków"
 
-#: ../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 "Usuń zaznaczone"
 
-#: ../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 "Usuń wszystkie zaznaczone obiekty z relacji"
 
-#: ../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 "Przesuń w dół"
 
-#: ../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 "Przesuwa wybrane węzły tak, aby znajdowały się w jednej linii."
 
-#: ../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 "Usuń z relacji członka zawartego w aktualnym wierszu tabeli z"
 
-#: ../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 "Pobierz członków"
 
-#: ../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 "Pobierz wszystkie niekompletne drogi i węzły w relacji"
@@ -4025,5 +4319,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
@@ -4044,9 +4338,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 "tak"
 
-#: ../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
@@ -4068,31 +4362,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 "nie"
 
-#: ../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 "Członkowie: {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 "Edytor relacji: {0}"
 
-#: ../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 "Wystąpiły konfikty podczas importowania."
 
-#: ../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 "Błąd podczas parsowania odpowiedzi serwera."
 
-#: ../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 "Nie można połączyć się z serwerem."
+
+#: ../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
@@ -4157,18 +4454,18 @@
 msgstr "Źródła i rodzaje danych"
 
-#: ../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 "Pobierz jako nową warstwę"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:174
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:173
 msgid "Download Area"
 msgstr "Pobierany obszar"
 
-#: ../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 ""
 "Pobierany obszar jest za duży, prawdopodobnie zostanie odrzucony przez serwer"
 
-#: ../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 ""
@@ -4197,5 +4494,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 "Miejsca"
@@ -4242,21 +4539,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 "rodzaj"
@@ -4296,14 +4593,4 @@
 msgid "Tile Numbers"
 msgstr "Numery kafelków mapy"
-
-#: ../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 "Możesz użyć myszki lub Ctrl+strzałki/./ aby powiększać i przesuwać."
-
-#. 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 "Mapa"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:98
@@ -4383,5 +4670,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)"
@@ -4497,14 +4784,14 @@
 msgstr "Pliki audio Wave (*.wav)"
 
-#: ../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 "Markery audio z {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244
 msgid "Import images"
 msgstr "Importuj obrazki"
 
-#: ../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, "
@@ -4514,5 +4801,5 @@
 msgstr[2] "{0} śladów, "
 
-#: ../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, "
@@ -4522,5 +4809,5 @@
 msgstr[2] "{0} tras, "
 
-#: ../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"
@@ -4530,28 +4817,28 @@
 msgstr[2] "{0} punktów"
 
-#: ../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 "Nazwa: {0}"
 
-#: ../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 "Opis: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347
 msgid "Timespan: "
 msgstr "Okres czasu: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354
 msgid "Length: "
 msgstr "Długość: "
 
-#: ../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 "Przekształć w warstwę danych"
 
-#: ../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 ""
@@ -4562,11 +4849,11 @@
 "za niebezpieczne.<br>Jeśli chcesz wysłać same ślady zajrzyj tu:"
 
-#: ../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
@@ -4576,29 +4863,29 @@
 msgstr "Przekonwertowany z: {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 "Pobierz dane OSM wzdłuż tej ścieżki"
 
-#: ../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 "Pobierz wszystko pomiędzy:"
 
-#: ../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 "{0} metrów"
 
-#: ../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 "Maksymalny obszar na zapytanie:"
 
-#: ../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 "{0} km kw."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:822
 #, java-format
 msgid ""
@@ -4609,5 +4896,5 @@
 "html>"
 
-#: ../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 ""
@@ -4615,5 +4902,5 @@
 "danymi dźwiękowymi."
 
-#: ../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 "
@@ -4621,5 +4908,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 "
@@ -4627,33 +4914,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 "poza pobranym obszarem"
 
-#: ../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 "Obiekty na warstwie {0}:"
 
-#: ../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} usuniętych.)"
 
-#: ../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"
@@ -4661,21 +4957,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"
@@ -4826,5 +5122,5 @@
 "użyte)."
 
-#: ../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
@@ -4833,5 +5129,5 @@
 msgstr "Proszę wybrać wiersz do edycji"
 
-#: ../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
@@ -4839,5 +5135,5 @@
 msgstr "Nowa wartość dla {0}"
 
-#: ../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
@@ -4847,5 +5143,5 @@
 msgstr "Proszę wybrać wiersz do usunięcia"
 
-#: ../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 "Podaj nowy klucz i jego wartość"
@@ -5722,106 +6018,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 "Nazwa"
@@ -6294,6 +6590,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:36
-msgid "Login name (email) to the OSM account."
-msgstr "Login (adres email) konta OSM"
+msgid "Login name (e-mail) to the OSM account."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
@@ -6307,6 +6603,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
-msgid "OSM username (email)"
-msgstr "Użytkownik OSM (email)"
+msgid "OSM username (e-mail)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
@@ -6317,11 +6613,7 @@
 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 ""
-"<html>UWAGA: Hasło jest zapisywane otwartym tekstem w pliku ustawień."
-"<br>Hasło jest przesyłane otwartym tekstem podczas połączenia z serwerem i "
-"jest częścią adresu.<br><b>Nie należy używać żadnych wartościowych haseł</"
-"b></html>"
 
 #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on
@@ -6614,6 +6906,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 "Łączenie z serwerem OSM..."
@@ -6624,7 +6917,7 @@
 msgstr "Pobieranie punktów od {0} do {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 "Pobieranie danych OSM..."
@@ -6690,15 +6983,14 @@
 msgstr "Import NMEA zakończony niepowodzeniem!"
 
-#: ../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 ""
@@ -6707,31 +6999,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 "Otwieranie zestawu zmian..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:351
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298
 msgid "Closing changeset..."
 msgstr "Zamykanie zestawu zmian..."
 
-#: ../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 "Przygotowywanie..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:381
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:326
 msgid "Uploading..."
 msgstr "Wysyłanie..."
@@ -6746,25 +7044,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 "Nieprawidłowe hasło lub nazwa użytkownika."
 
-#: ../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 "Uwaga: Hasło nie jest szyfrowane podczas transmisji."
 
-#: ../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 "Zapisz nazwę użytkownika i hasło (nieszyfrowane)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:89
 msgid "Enter Password"
 msgstr "Wprowadź hasło"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
 msgid "Login"
 msgstr "Logowanie"
 
-#: ../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..."
@@ -6775,4 +7073,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."
@@ -6865,9 +7206,23 @@
 msgstr "Zły format identyfikatora węzła"
 
-#: ../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 "Łączenie z serwerem..."
 
-#: ../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."
@@ -6876,17 +7231,9 @@
 "Internetem."
 
-#: ../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 ""
-"Serwer zgłosił błąd wewnętrzny. Spróbuj zmniejszyć obszar lub spróbować po "
-"chwili."
-
-#: ../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 ""
 
@@ -6902,5 +7249,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 "Pobierz wtyczki"
@@ -7092,9 +7439,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 "Pobierz brakujące wtyczki"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:128
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:119
 #, java-format
 msgid ""
@@ -7107,6 +7454,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
@@ -7129,35 +7476,35 @@
 msgstr "nieznany"
 
-#: ../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}: Wersja {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 "Wtyczka dostarczana wraz z JOSM"
 
-#: ../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 "Błąd podczas wczytywania pliku informacyjnego wtyczki: {0}"
 
-#: ../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 "To znajduje się za końcem nagrania."
 
-#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:329
+#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:340
 msgid "Error playing sound"
 msgstr "Błąd odtwarzania dźwięku"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
 msgid "Do nothing"
 msgstr "Nic nie rób"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
 msgid "Report Bug"
 msgstr "Zgłoś błąd"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:52
 msgid ""
 "An unexpected exception occurred.\n"
@@ -7171,14 +7518,14 @@
 "z najnowszej wersji JOSM, rozważ proszę możliwość zgłoszenia błędu."
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55
 msgid "Unexpected Exception"
 msgstr "Nieoczekiwany błąd"
 
-#: ../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 "Proszę zgłosić bład pod adresem {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 ""
@@ -7186,5 +7533,5 @@
 "błędną sytuację."
 
-#: ../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 "
@@ -7194,9 +7541,9 @@
 "błędu."
 
-#: ../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 "Upewnij się, żeby załączyć następujące informacje:"
 
-#: ../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 już został skopiowany do schowka.)"
@@ -7280,5 +7627,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 "Opis"
@@ -7651,5 +7998,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 ""
@@ -7683,5 +8030,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"
@@ -7704,5 +8050,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
@@ -7795,6 +8141,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/"
@@ -7870,6 +8216,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
@@ -7877,11 +8223,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 ""
@@ -7898,13 +8244,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 ""
@@ -7925,5 +8271,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 ""
 
@@ -8017,5 +8363,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
@@ -8023,59 +8369,28 @@
 msgstr "Pusta warstwa"
 
+#: ../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 "Błędny format pliku"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:481
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:401
 #, java-format
 msgid ""
@@ -8084,14 +8399,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 ""
@@ -8186,11 +8501,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 ""
@@ -8200,5 +8515,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 ""
@@ -8485,4 +8800,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 ""
 
@@ -8794,42 +9113,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 "Zmierzone wartości"
 
-#: ../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 "Otwiera okno z wynikami pomiarów."
 
-#: ../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 "Resetuj"
 
-#: ../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 "Resetuje bieżące wyniki pomiarów i kasuje ścieżki pomiarowe."
 
-#: ../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 "Długość ścieżki"
 
-#: ../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 "Długość zaznaczenia"
 
-#: ../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 "Powierzchnia zaznaczenia"
 
-#: ../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 "Kąt"
 
-#: ../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 "Kąt pomiędzy dwoma wybranymi węzłami"
 
-#: ../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 ""
@@ -8888,6 +9207,6 @@
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
-msgid "Open the OpenStreetBugs window and activate the automatic download"
-msgstr "Otwiera okno OpenStreetBugs i aktywuje automatyczne pobieranie danych"
+msgid "Opens the OpenStreetBugs window and activates the automatic download"
+msgstr ""
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:123
@@ -8964,5 +9283,5 @@
 msgstr "Osmarender"
 
-#: ../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 "
@@ -8972,9 +9291,9 @@
 "Ustawienia mapy w ustawieniach programu."
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:123
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:127
 msgid "osmarender options"
 msgstr "opcje osmarender"
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:124
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:128
 msgid "Firefox executable"
 msgstr "Ścieżka do programu Firefox"
@@ -9401,5 +9720,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 "Nazwa ulicy"
@@ -9489,5 +9808,5 @@
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:195
-msgid "No intersections found. Nothing was changed."
+msgid "No intersection found. Nothing was changed."
 msgstr ""
 
@@ -10355,19 +10674,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 "Pomoc wtyczki WMS"
@@ -10426,5 +10744,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113
 #, java-format
 msgid ""
@@ -10469,4 +10787,29 @@
 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 "Błędny format pliku"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:163
@@ -10557,4 +10900,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 ""
@@ -10569,5 +10917,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 ""
 
@@ -10851,5 +11199,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 "Numer"
@@ -11351,5 +11699,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 "Szerokość (w metrach)"
@@ -11818,7 +12166,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 "Rodzaj"
@@ -12434,10 +12782,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 "Operator"
@@ -12649,7 +12997,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 "Wysokość"
@@ -13581,5 +13929,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 "Opłata"
@@ -13715,5 +14063,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 "Oznaczenie (numer toru)"
@@ -13721,5 +14069,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 "obszar"
@@ -13771,11 +14119,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 "schronienie"
+
+#. 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 ""
@@ -13783,5 +14141,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1512
+#: build/trans_presets.java:1513
 msgid "Taxi"
 msgstr "taksówki"
@@ -13789,5 +14147,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 "Edycja postoju taksówek"
@@ -13795,5 +14153,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1519
+#: build/trans_presets.java:1520
 msgid "Airport"
 msgstr "lotnisko"
@@ -13801,15 +14159,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 "Edycja lotniska"
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1526
+#: build/trans_presets.java:1527
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1527
+#: build/trans_presets.java:1528
 msgid "ICAO"
 msgstr "ICAO"
@@ -13818,5 +14176,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1532
+#: build/trans_presets.java:1533
 msgid "Accomodation"
 msgstr "Zakwaterowanie"
@@ -13828,5 +14186,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 "hotel"
@@ -13835,15 +14193,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 "Edycja hotelu"
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1539
+#: build/trans_presets.java:1540
 msgid "Stars"
 msgstr "Gwiazdki"
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1541
+#: build/trans_presets.java:1542
 msgid "Motel"
 msgstr "motel"
@@ -13851,20 +14209,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 "Edycja motelu"
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1547
+#: build/trans_presets.java:1548
 msgid "Guest House"
 msgstr "kwatera"
 
 #. item
-#: build/trans_presets.java:1548
+#: build/trans_presets.java:1549
 msgid "Edit Guest House"
 msgstr "Edycja kwatery turystycznej"
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1552
+#: build/trans_presets.java:1553
 msgid "Chalet"
 msgstr "chata górska"
@@ -13872,10 +14230,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 "Edycja chaty górskiej"
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1558
+#: build/trans_presets.java:1559
 msgid "Hostel"
 msgstr "hostel"
@@ -13883,30 +14241,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 "Edycja hostelu"
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1564
+#: build/trans_presets.java:1565
 msgid "Alpine Hut"
 msgstr "chata alpejska"
 
 #. item
-#: build/trans_presets.java:1565
+#: build/trans_presets.java:1566
 msgid "Edit Alpine Hut"
 msgstr "Edycja chaty alpejskiej"
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1570
+#: build/trans_presets.java:1571
 msgid "Caravan Site"
 msgstr "kemping"
 
 #. item
-#: build/trans_presets.java:1571
+#: build/trans_presets.java:1572
 msgid "Edit Caravan Site"
 msgstr "Edycja kempingu"
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1575
+#: build/trans_presets.java:1576
 msgid "Camping Site"
 msgstr "pole namiotowe"
@@ -13914,10 +14272,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 "Edycja pola namiotowego"
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1582
+#: build/trans_presets.java:1583
 msgid "Food+Drinks"
 msgstr "Wyżywienie"
@@ -13928,5 +14286,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 "restauracja"
@@ -13934,5 +14292,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 "Edycja restauracji"
@@ -13940,5 +14298,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 "Kuchnia"
@@ -13946,61 +14304,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 "włoska"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "chinese"
 msgstr "chińska"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "burger"
 msgstr "hamburgery"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "greek"
 msgstr "grecka"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "german"
 msgstr "niemiecka"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "indian"
 msgstr "indyjska"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "regional"
 msgstr "regionalna"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "turkish"
 msgstr "turecka"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "asian"
 msgstr "azjatycka"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "thai"
 msgstr "tajska"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "mexican"
 msgstr "meksykańska"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "japanese"
 msgstr "japońska"
 
-#: build/trans_presets.java:1590
+#: build/trans_presets.java:1591
 msgid "Fast Food"
 msgstr "fast food"
@@ -14008,9 +14366,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 "Edycja restauracji fast-food"
 
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1598
 msgid "Cafe"
 msgstr "kawiarnia"
@@ -14018,10 +14376,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 "Edycja kawiarni"
 
 #. item "Food+Drinks/Cafe" text "Name"
-#: build/trans_presets.java:1603
+#: build/trans_presets.java:1604
 msgid "Pub"
 msgstr "pub"
@@ -14029,20 +14387,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 "Edycja pubu"
 
 #. item "Food+Drinks/Pub" text "Name"
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1610
 msgid "Biergarten"
 msgstr "ogródek piwny"
 
 #. item
-#: build/trans_presets.java:1610
+#: build/trans_presets.java:1611
 msgid "Edit Biergarten"
 msgstr "Edycja ogródka piwnego"
 
 #. item "Food+Drinks/Biergarten" text "Name"
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1615
 msgid "Bar"
 msgstr "bar"
@@ -14050,10 +14408,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 "Edycja baru"
 
 #. item "Food+Drinks/Bar" text "Name"
-#: build/trans_presets.java:1620
+#: build/trans_presets.java:1621
 msgid "Nightclub"
 msgstr "klub nocny"
@@ -14061,20 +14419,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 "Edycja klubu nocnego"
 
 #. item "Food+Drinks/Nightclub" text "Name"
-#: build/trans_presets.java:1627
+#: build/trans_presets.java:1628
 msgid "Tourism"
 msgstr "Turystyka"
 
 #. group "Tourism"
-#: build/trans_presets.java:1628
+#: build/trans_presets.java:1629
 msgid "Attraction"
 msgstr "atrakcja"
 
 #. item
-#: build/trans_presets.java:1629
+#: build/trans_presets.java:1630
 msgid "Edit Attraction"
 msgstr "Edycja atrakcji turystycznej"
@@ -14083,11 +14441,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 "godziny otwarcia"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1634
+#: build/trans_presets.java:1635
 msgid "Museum"
 msgstr "muzeum"
@@ -14095,10 +14453,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 "Edycja muzeum"
 
 #. item "Tourism/Museum" text "Name"
-#: build/trans_presets.java:1640
+#: build/trans_presets.java:1641
 msgid "Zoo"
 msgstr "zoo"
@@ -14107,10 +14465,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 "Edycja zoo"
 
 #. item "Tourism/Zoo" text "Name"
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1648
 msgid "Viewpoint"
 msgstr "punkt widokowy"
@@ -14118,25 +14476,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 "Edycja punktu widokowego"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1652
+#: build/trans_presets.java:1653
 msgid "Look-Out Tower"
 msgstr "wieża widokowa"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1654
+#: build/trans_presets.java:1655
 msgid "Theme Park"
 msgstr "park rozrywki"
 
 #. item
-#: build/trans_presets.java:1655
+#: build/trans_presets.java:1656
 msgid "Edit Theme Park"
 msgstr "Edycja parku rozrywki"
 
 #. item "Tourism/Theme Park" text "Name"
-#: build/trans_presets.java:1659
+#: build/trans_presets.java:1660
 msgid "Artwork"
 msgstr "sztuka"
@@ -14144,5 +14502,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 "Edycja obiektu sztuki"
@@ -14150,5 +14508,5 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1667
 msgid "Information Office"
 msgstr ""
@@ -14156,83 +14514,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 "Mapa"
+
 #. 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 "mapa"
 
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1679
 msgid "citymap"
 msgstr "mapa miasta"
 
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1679
 msgid "hikingmap"
 msgstr "mapa tras pieszych"
 
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1679
 msgid "bicyclemap"
 msgstr "mapa tras rowerowych"
 
 #. 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 "Rodzaj tablicy"
 
 #. item "Tourism/Information Board" combo "Board Type"
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1686
 msgid "board"
 msgstr "tablica informacyjna"
 
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1686
 msgid "history"
 msgstr "tablica historyczna"
 
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1686
 msgid "nature"
 msgstr "tablica przyrodnicza"
 
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1686
 msgid "wildlife"
 msgstr "tablica o zwierzętach"
 
 #. 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 "schronienie"
-
-#. item
-#: build/trans_presets.java:1703
+#. item
+#: build/trans_presets.java:1704
 msgid "Edit Shelter"
 msgstr "Edycja schronienia"
@@ -14240,25 +14595,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 "miejsce na ognisko"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1709
 msgid "Picnic Site"
 msgstr "miejsce na piknik"
 
 #. item
-#: build/trans_presets.java:1709
+#: build/trans_presets.java:1710
 msgid "Edit Picnic Site"
 msgstr "Edycja miejsca na piknik"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1716
 msgid "Historic Places"
 msgstr "Miejsca historyczne"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1716
+#: build/trans_presets.java:1717
 msgid "Castle"
 msgstr "zamek"
@@ -14267,20 +14622,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 "Edycja zamku"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1724
 msgid "Ruins"
 msgstr "ruiny"
 
 #. item
-#: build/trans_presets.java:1724
+#: build/trans_presets.java:1725
 msgid "Edit Ruins"
 msgstr "Edycja ruin"
 
 #. item "Historic Places/Ruins" text "Name"
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1729
 msgid "Archaeological Site"
 msgstr "Wykopaliska archeologiczne"
@@ -14289,10 +14644,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 "Edycja wykopalisk archeologicznych"
 
 #. item "Historic Places/Archaeological Site" text "Name"
-#: build/trans_presets.java:1735
+#: build/trans_presets.java:1736
 msgid "Battlefield"
 msgstr "pole bitwy"
@@ -14300,5 +14655,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 "Edycja pola bitwy"
@@ -14306,15 +14661,15 @@
 #. item "Historic Places/Battlefield" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1743
 msgid "Monument"
 msgstr "pomnik"
 
 #. item
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1744
 msgid "Edit Monument"
 msgstr "Edycja pomnika"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1748
 msgid "Memorial"
 msgstr "miejsce pamięci"
@@ -14322,45 +14677,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 "Edycja miejsca pamięci"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1753
+#: build/trans_presets.java:1754
 msgid "Wayside Cross"
 msgstr "krzyż przydrożny"
 
 #. item
-#: build/trans_presets.java:1754
+#: build/trans_presets.java:1755
 msgid "Edit Wayside Cross"
 msgstr "Edycja krzyża przydrożnego"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1758
+#: build/trans_presets.java:1759
 msgid "Wayside Shrine"
 msgstr "kapliczka"
 
 #. item
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1760
 msgid "Edit Wayside Shrine"
 msgstr "Edycja kapliczki"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1765
 msgid "Leisure"
 msgstr "Rozrywka"
 
 #. group "Leisure"
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1766
 msgid "Water Park"
 msgstr "park wodny"
 
 #. item
-#: build/trans_presets.java:1766
+#: build/trans_presets.java:1767
 msgid "Edit Water Park"
 msgstr "Edycja parku wodnego"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1770
+#: build/trans_presets.java:1771
 msgid "Playground"
 msgstr "plac zabaw"
@@ -14368,15 +14723,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 "Edycja placu zabaw"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1776
+#: build/trans_presets.java:1777
 msgid "Fishing"
 msgstr "miejsce do wędkowania"
 
 #. item
-#: build/trans_presets.java:1777
+#: build/trans_presets.java:1778
 msgid "Edit Fishing"
 msgstr "Edycja miejsca do wędkowania"
@@ -14384,15 +14739,15 @@
 #. item "Leisure/Fishing" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1783
+#: build/trans_presets.java:1784
 msgid "Sport Facilities"
 msgstr "obiekty sportowe"
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1784
+#: build/trans_presets.java:1785
 msgid "Stadium"
 msgstr "stadion"
 
 #. item
-#: build/trans_presets.java:1785
+#: build/trans_presets.java:1786
 msgid "Edit Stadium"
 msgstr "Edycja stadionu"
@@ -14406,6 +14761,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 "wybierz sport:"
@@ -14781,6 +15136,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
@@ -14813,227 +15168,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 "różne sporty"
 
-#: 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 "łucznictwo"
 
-#: 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 "lekkoatletyka"
 
-#: 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 "baseball"
 
-#: 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 "siatkówka"
 
-#: 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 "bule"
 
-#: 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 "gra w kule"
 
-#: 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 "kajakarstwo"
 
-#: 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 "wspinaczka"
 
-#: 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 "krykiet"
 
-#: 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 "krokiet"
 
-#: 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 "kolarstwo"
 
-#: 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 "wyścigi psów"
 
-#: 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 "jazda konna"
 
-#: 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 "football"
 
-#: 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 "golf"
 
-#: 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 "gimnastyka"
 
-#: 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 "hokej"
 
-#: 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 "wyścigi konne"
 
-#: 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 "sporty motorowe"
 
-#: 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 "pelota"
 
-#: 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 "rugby"
 
-#: 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 "strzelectwo"
 
-#: 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 "jazda na deskorolce"
 
-#: 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 "łyżwiarstwo"
 
-#: 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 "narciarstwo"
 
-#: 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 "piłka nożna"
 
-#: 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 "pływanie"
 
-#: 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 "tenis stołowy"
 
-#: 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 "tenis"
 
-#: build/trans_presets.java:1793
+#: build/trans_presets.java:1794
 msgid "Sports Centre"
 msgstr "centrum sportowe"
 
 #. item
-#: build/trans_presets.java:1794
+#: build/trans_presets.java:1795
 msgid "Edit Sports Centre"
 msgstr "Edycja centrum sportowego"
 
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1803
 msgid "Pitch"
 msgstr "boisko"
 
 #. item
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1804
 msgid "Edit Pitch"
 msgstr "Edycja boiska"
 
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1812
 msgid "Racetrack"
 msgstr "tor wyścigowy"
 
 #. item
-#: build/trans_presets.java:1812
+#: build/trans_presets.java:1813
 msgid "Edit Racetrack"
 msgstr "Edycja toru wyścigowego"
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1821
 msgid "Golf Course"
 msgstr "pole golfowe"
 
 #. item
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1822
 msgid "Edit Golf Course"
 msgstr "Edycja pola golfowego"
 
 #. item "Sport Facilities/Golf Course" text "Name"
-#: build/trans_presets.java:1825
+#: build/trans_presets.java:1826
 msgid "Miniature Golf"
 msgstr "miniaturowy golf"
 
 #. item
-#: build/trans_presets.java:1826
+#: build/trans_presets.java:1827
 msgid "Edit Miniature Golf"
 msgstr "Edycja miniaturowego golfa"
 
 #. item "Sport Facilities/Miniature Golf" text "Name"
-#: build/trans_presets.java:1831
+#: build/trans_presets.java:1832
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1833
 msgid "Multi"
 msgstr "różne sporty"
 
 #. item
-#: build/trans_presets.java:1833
+#: build/trans_presets.java:1834
 msgid "Edit Multi"
 msgstr ""
@@ -15072,191 +15427,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 "boisko"
 
-#: 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 "centrum sportowe"
 
-#: 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 "stadion"
 
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1839
 msgid "10pin"
 msgstr "kręgle"
 
 #. item
-#: build/trans_presets.java:1839
+#: build/trans_presets.java:1840
 msgid "Edit 10pin"
 msgstr "Edycja kręgli"
 
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1845
 msgid "Athletics"
 msgstr "lekkoatletyka"
 
 #. item
-#: build/trans_presets.java:1845
+#: build/trans_presets.java:1846
 msgid "Edit Athletics"
 msgstr "Edycja"
 
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1851
 msgid "Archery"
 msgstr "łucznictwo"
 
 #. 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 "wspinaczka"
 
 #. 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 "kajakarstwo"
 
 #. 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 "kolarstwo"
 
 #. 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 "wyścigi psów"
 
 #. 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 "jeździectwo"
 
 #. 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 "wyścigi konne"
 
 #. 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 "gimnastyka"
 
 #. 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 "sporty motorowe"
 
 #. 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 "łyżwiarstwo"
 
 #. 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 "jazda na deskorolce"
 
 #. 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 "pływanie"
 
 #. 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 "narciarstwo"
@@ -15264,56 +15619,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 "Rodzaj trasy"
 
 #. 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 "Poziom trudności"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:1929
 msgid "novice"
 msgstr "dla początkujących"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:1929
 msgid "easy"
 msgstr "łatwa"
 
-#: 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 "dla ekspertów"
 
-#: 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 "strzelectwo"
@@ -15321,178 +15676,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 "Sporty z piłką"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1941
 msgid "Soccer"
 msgstr "piłka nożna"
 
 #. 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 "football"
 
 #. 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 "australijski football"
 
 #. 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 "baseball"
 
 #. item
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:1960
 msgid "Edit Baseball"
 msgstr ""
 
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:1965
 msgid "Basketball"
 msgstr "koszykówka"
 
 #. item
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:1966
 msgid "Edit Basketball"
 msgstr ""
 
-#: 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 "pole golfowe"
 
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:1977
 msgid "Boule"
 msgstr "bule"
 
 #. item
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:1978
 msgid "Edit Boule"
 msgstr "Edycja boiska do gry w boule"
 
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:1983
 msgid "Bowls"
 msgstr "gra w kule"
 
 #. 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 "krykiet"
 
 #. item
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:1990
 msgid "Edit Cricket"
 msgstr "Edycja boiska do gry w krykieta"
 
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:1995
 msgid "Cricket Nets"
 msgstr "krykiet - siatki"
 
 #. item
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:1996
 msgid "Edit Cricket Nets"
 msgstr "Edycja siatek do treningu gry w krykieta"
 
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:2001
 msgid "Croquet"
 msgstr "krokiet"
 
 #. item
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:2002
 msgid "Edit Croquet"
 msgstr "Edycja miejsca do gry w krokieta"
 
-#: build/trans_presets.java:2006
+#: build/trans_presets.java:2007
 msgid "Hockey"
 msgstr "hokej"
 
 #. item
-#: build/trans_presets.java:2007
+#: build/trans_presets.java:2008
 msgid "Edit Hockey"
 msgstr "Edycja miejsca do gry w hokeja"
 
-#: build/trans_presets.java:2012
+#: build/trans_presets.java:2013
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2014
 msgid "Edit Pelota"
 msgstr "Edycja miejsca do gry w pelotę"
 
-#: 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 "rugby"
 
 #. item
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2026
 msgid "Edit Rugby"
 msgstr "Edycja miejsca do gry w rugby"
 
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:2031
 msgid "Table Tennis"
 msgstr "tenis stołowy"
 
 #. item
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2032
 msgid "Edit Table Tennis"
 msgstr "Edycja miejsca do gry w tenis stołowy"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2037
 msgid "Tennis"
 msgstr "tenis"
 
 #. item
-#: build/trans_presets.java:2037
+#: build/trans_presets.java:2038
 msgid "Edit Tennis"
 msgstr "Edycja miejsca do gry w tenisa"
 
 #. <separator/>
-#: build/trans_presets.java:2044
+#: build/trans_presets.java:2045
 msgid "Buildings"
 msgstr "Budynki"
 
 #. group "Buildings"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2046
 msgid "Building"
 msgstr "budynek"
@@ -15500,5 +15855,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2049
 msgid "Public Building"
 msgstr "budynek użyteczności publicznej"
@@ -15506,10 +15861,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 "Edycja budynku użyteczności publicznej"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2055
 msgid "Town hall"
 msgstr "ratusz"
@@ -15517,10 +15872,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 "Edycja ratusza"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2061
 msgid "Embassy"
 msgstr "ambasada"
@@ -15528,10 +15883,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 "Edycja ambasady"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2066
+#: build/trans_presets.java:2067
 msgid "Courthouse"
 msgstr "sąd"
@@ -15540,10 +15895,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 "Edycja siedziby sądu"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2074
 msgid "Prison"
 msgstr "więzienie"
@@ -15552,10 +15907,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 "Edycja więzienia"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2080
+#: build/trans_presets.java:2081
 msgid "Police"
 msgstr "posterunek policji"
@@ -15565,10 +15920,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 "Edycja posterunku policji"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2089
 msgid "Fire Station"
 msgstr "straż pożarna"
@@ -15577,10 +15932,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 "Edycja posterunku straży pożarnej"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2096
 msgid "Post Office"
 msgstr "poczta"
@@ -15588,5 +15943,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 "Edycja urzędu pocztowego"
@@ -15594,15 +15949,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2103
 msgid "Kindergarten"
 msgstr "przedszkole"
 
 #. item
-#: build/trans_presets.java:2103
+#: build/trans_presets.java:2104
 msgid "Edit Kindergarten"
 msgstr "Edycja przedszkola"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2108
 msgid "School"
 msgstr "szkoła"
@@ -15610,10 +15965,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 "Edycja szkoły"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2114
 msgid "University"
 msgstr "uniwersytet"
@@ -15621,10 +15976,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 "Edycja uniwersytetu"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2120
 msgid "College"
 msgstr "college"
@@ -15632,5 +15987,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 "Edycja college'u"
@@ -15638,5 +15993,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2126
+#: build/trans_presets.java:2127
 msgid "Cinema"
 msgstr "kino"
@@ -15645,10 +16000,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 "Edycja kina"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2133
+#: build/trans_presets.java:2134
 msgid "Library"
 msgstr "biblioteka"
@@ -15657,10 +16012,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 "Edycja biblioteki"
 
 #. item "Buildings/Library" text "Name"
-#: build/trans_presets.java:2140
+#: build/trans_presets.java:2141
 msgid "Arts Centre"
 msgstr "centrum kulturalne"
@@ -15668,10 +16023,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 "Edycja centrum kulturalnego"
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2146
+#: build/trans_presets.java:2147
 msgid "Theatre"
 msgstr "teatr"
@@ -15680,10 +16035,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 "Edycja teatru"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2154
 msgid "Place of Worship"
 msgstr "miejsce kultu religijnego"
@@ -15693,5 +16048,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 "Edycja miejsca kultu religijnego"
@@ -15700,6 +16055,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 "Religia"
@@ -15708,66 +16063,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 "bahaizm"
 
-#: 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 "buddyzm"
 
-#: 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 "chrześcijaństwo"
 
-#: 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 "hinduizm"
 
-#: 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 "dżinizm"
 
-#: 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 "judaizm"
 
-#: 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 "islam"
 
-#: 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 "sikhizm"
 
-#: 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 "spirytualizm"
 
-#: 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 "taoizm"
 
-#: 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 "zaratusztrianizm"
 
-#: 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 "Wyznanie"
@@ -15776,81 +16131,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 "kościół anglikański"
 
-#: 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 "baptyści"
 
-#: 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 "kościół katolicki"
 
-#: 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 "ewangelikalizm"
 
-#: 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 "świadkowie Jehowy"
 
-#: 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 "luteranie"
 
-#: 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 "metodyści"
 
-#: 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 "mormoni"
 
-#: 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 "kościół prawosławny"
 
-#: 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 "zielonoświątkowcy"
 
-#: 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 "prezbiterianie"
 
-#: 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 "protestanci"
 
-#: 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 "kwakrzy"
 
-#: 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 "szyici"
 
-#: 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 "sunnici"
 
 #. <separator/>
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2165
 msgid "Addresses"
 msgstr "Adresy"
@@ -15859,5 +16214,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 "Edycja informacji o adresach"
@@ -15865,5 +16220,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2169
+#: build/trans_presets.java:2170
 msgid "House number"
 msgstr "Numer domu"
@@ -15871,20 +16226,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2172
 msgid "House name"
 msgstr "Nazwa domu"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2174
 msgid "City name"
 msgstr "Nazwa miejscowości"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2174
+#: build/trans_presets.java:2175
 msgid "Post code"
 msgstr "Kod pocztowy"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2176
 msgid "Country code"
 msgstr "Kod kraju"
@@ -15892,5 +16247,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2179
 msgid "Address Interpolation"
 msgstr "Interpolacja adresów"
@@ -15899,5 +16254,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 "Edycja interpolacji adresów"
@@ -15905,71 +16260,71 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2184
 msgid "Numbering scheme"
 msgstr "Sposób numeracji domów"
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2184
 msgid "odd"
 msgstr "parzyste"
 
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2184
 msgid "even"
 msgstr "nieparzyste"
 
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2184
 msgid "all"
 msgstr "wszystkie"
 
-#: 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 "Obiekty sztuczne"
 
 #. group "Man Made"
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2188
 msgid "Works"
 msgstr "zakład produkcyjny"
 
 #. item
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2189
 msgid "Edit Works"
 msgstr "Edycja zakładu produkcyjnego"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2193
 msgid "Tower"
 msgstr "wieża"
 
 #. item
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2194
 msgid "Edit Tower"
 msgstr "Edycja wieży"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2198
 msgid "Water Tower"
 msgstr "wieża ciśnień"
 
 #. item
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2199
 msgid "Edit Water Tower"
 msgstr "Edycja wieży ciśnień"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2203
 msgid "Gasometer"
 msgstr "zbiornik gazu"
 
 #. item
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2204
 msgid "Edit Gasometer"
 msgstr "Edycja zbiornika gazu"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2207
+#: build/trans_presets.java:2208
 msgid "Lighthouse"
 msgstr "latarnia morska"
@@ -15977,10 +16332,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 "Edycja latarni morskiej"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2214
 msgid "Windmill"
 msgstr "wiatrak"
@@ -15988,10 +16343,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 "Edycja wiatraka"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2220
 msgid "Pipeline"
 msgstr "rurociąg"
@@ -15999,10 +16354,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 "Edycja rurociągu"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2225
+#: build/trans_presets.java:2226
 msgid "Wastewater Plant"
 msgstr "oczyszczalnia ścieków"
@@ -16012,10 +16367,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 "Edycja oczyszczalni ścieków"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2233
+#: build/trans_presets.java:2234
 msgid "Crane"
 msgstr "dźwig"
@@ -16023,10 +16378,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 "Edycja dźwigu"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2239
+#: build/trans_presets.java:2240
 msgid "Beacon"
 msgstr "radiolatarnia"
@@ -16034,10 +16389,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 "Edycja radiolatarni"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2245
+#: build/trans_presets.java:2246
 msgid "Survey Point"
 msgstr "punkt geodezyjny"
@@ -16045,10 +16400,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 "Edycja punktu geodezyjnego"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2252
 msgid "Surveillance"
 msgstr "monitoring"
@@ -16056,5 +16411,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 "Edycja kamery do monitoringu"
@@ -16062,5 +16417,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2258
+#: build/trans_presets.java:2259
 msgid "Power Generator"
 msgstr "źródło energii elektrycznej"
@@ -16070,39 +16425,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 "Edycja źródła energii elektrycznej"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "wind"
 msgstr "wiatrowa"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "hydro"
 msgstr "wodna"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "fossil"
 msgstr "cieplna"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "nuclear"
 msgstr "jądrowa"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "coal"
 msgstr "węglowa"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "photovoltaic"
 msgstr "fotowoltaiczna"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "gas"
 msgstr "gazowa"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2268
 msgid "Power Station"
 msgstr "elektrownia"
@@ -16111,10 +16466,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 "Edycja elektrowni"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2274
+#: build/trans_presets.java:2275
 msgid "Power Sub Station"
 msgstr "rozdzielnia elektryczna"
@@ -16123,5 +16478,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 "Edycja rozdzielni elektrycznej"
@@ -16129,10 +16484,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 "oznaczenie linii"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2282
+#: build/trans_presets.java:2283
 msgid "Power Tower"
 msgstr "słup elektryczny"
@@ -16143,5 +16498,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 "Edycja słupa linii wysokiego napięcia"
@@ -16149,5 +16504,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 "linia wysokiego napięcia"
@@ -16156,25 +16511,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 "Edycja linii wysokiego napięcia"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2298
 msgid "Voltage"
 msgstr "Napięcie"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2299
 msgid "Amount of Wires"
 msgstr "Ilość przewodów"
 
 #. 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 "toalety"
@@ -16182,20 +16537,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 "Numer referencyjny"
 
 #. 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 "Uwagi"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2312
 msgid "Post Box"
 msgstr "skrzynka pocztowa"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2317
 msgid "Telephone"
 msgstr "telefon"
@@ -16204,5 +16559,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 "Edycja telefonu"
@@ -16210,5 +16565,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 "na monety"
@@ -16216,5 +16571,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 "na banknoty"
@@ -16222,5 +16577,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 "na karty chipowe"
@@ -16228,5 +16583,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 "na karty debetowe"
@@ -16234,15 +16589,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 "na karty kredytowe"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2328
 msgid "Telephone cards"
 msgstr "na karty telefoniczne"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2330
 msgid "Recycling"
 msgstr "zbiórka odpadów"
@@ -16251,5 +16606,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 "Edycja punktu zbiórki odpadów"
@@ -16257,35 +16612,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 "baterie"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2336
 msgid "Cans"
 msgstr "puszki"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2337
 msgid "Clothes"
 msgstr "odzież"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2338
 msgid "Glass"
 msgstr "szkło"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2339
 msgid "Paper"
 msgstr "papier"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2340
 msgid "Scrap Metal"
 msgstr "złom"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2342
 msgid "Bench"
 msgstr "ławka"
@@ -16294,20 +16649,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 "Ambona myśliwska"
 
 #. item
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2347
 msgid "Edit Hunting Stand"
 msgstr "Edycja ambony strzelniczej"
 
 #. item "Amenities/Hunting Stand" check "Shelter"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2350
 msgid "Hide"
 msgstr ""
 
 #. item "Amenities/Hunting Stand" check "Hide"
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2351
 msgid "Lock"
 msgstr ""
@@ -16315,22 +16670,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 "Wysokość"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2351
+#: build/trans_presets.java:2352
 msgid "low"
 msgstr ""
 
-#: build/trans_presets.java:2351
+#: build/trans_presets.java:2352
 msgid "half"
 msgstr ""
 
-#: build/trans_presets.java:2351
+#: build/trans_presets.java:2352
 msgid "full"
 msgstr ""
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2354
 msgid "Fountain"
 msgstr "fontanna"
@@ -16339,10 +16694,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 "Edycja fontanny"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2361
 msgid "Drinking Water"
 msgstr "woda do picia"
@@ -16351,10 +16706,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 "Edycja punktu z wodą pitną"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2367
+#: build/trans_presets.java:2368
 msgid "Baby Hatch"
 msgstr ""
@@ -16362,25 +16717,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 "Sklepy"
 
 #. 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 "Edycja supermarketu"
 
 #. item "Shops/Supermarket" text "Name"
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:2382
 msgid "Convenience Store"
 msgstr "sklepik"
@@ -16388,10 +16743,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 "Edycja sklepiku"
 
 #. item "Shops/Convenience Store" text "Name"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2388
 msgid "Kiosk"
 msgstr "kiosk"
@@ -16399,10 +16754,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 "Edycja kiosku"
 
 #. item "Shops/Kiosk" text "Name"
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2394
 msgid "Vending machine"
 msgstr "automat sprzedający"
@@ -16410,5 +16765,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 "Edycja automatu sprzedającego"
@@ -16416,88 +16771,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 "Sprzedawane produkty"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "public_transport_tickets"
 msgstr "bilety komunikacji miejskiej"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "public_transport_plans"
 msgstr "mapy komunikacji miejskiej"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "parking_tickets"
 msgstr "bilety parkingowe"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "food"
 msgstr "jedzenie"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "drinks"
 msgstr "napoje"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "sweets"
 msgstr "słodycze"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "cigarettes"
 msgstr "papierosy"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "photos"
 msgstr "zdjęcia"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "animal_food"
 msgstr "jedzenie dla zwierząt"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "news_papers"
 msgstr "gazety"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "toys"
 msgstr "zabawki"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "stamps"
 msgstr "znaczki"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "SIM-cards"
 msgstr "karty SIM"
 
-#: 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 "vouchery"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "condoms"
 msgstr "prezerwatywy"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "tampons"
 msgstr "tampony"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "excrement_bags"
 msgstr "torby na odchody"
 
 #. 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 "rzeźnik"
@@ -16505,10 +16860,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 "Edycja sklepu mięsnego"
 
 #. item "Shops/Butcher" text "Name"
-#: build/trans_presets.java:2414
+#: build/trans_presets.java:2415
 msgid "Baker"
 msgstr "piekarnia"
@@ -16516,10 +16871,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 "Edycja piekarni"
 
 #. item "Shops/Baker" text "Name"
-#: build/trans_presets.java:2420
+#: build/trans_presets.java:2421
 msgid "Florist"
 msgstr "florysta"
@@ -16527,20 +16882,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 "Edycja kwiaciarni"
 
 #. item "Shops/Florist" text "Name"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2427
 msgid "Organic"
 msgstr "naturalna żywność"
 
 #. item
-#: build/trans_presets.java:2427
+#: build/trans_presets.java:2428
 msgid "Edit Organic Shop"
 msgstr "Edycja sklepu z naturalną żywnością"
 
 #. item "Shops/Organic" text "Name"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2432
 msgid "Alcohol"
 msgstr ""
@@ -16548,60 +16903,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 "napoje"
 
 #. 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 "komputery"
 
 #. item
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2444
 msgid "Edit Computer Shop"
 msgstr "Edycja sklepu komputerowego"
 
 #. item "Shops/Computer" text "Name"
-#: build/trans_presets.java:2447
+#: build/trans_presets.java:2448
 msgid "Electronics"
 msgstr "elektronika"
 
 #. item
-#: build/trans_presets.java:2448
+#: build/trans_presets.java:2449
 msgid "Edit Electronics Shop"
 msgstr "Edycja sklepu z elektroniką"
 
 #. item "Shops/Electronics" text "Name"
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2453
 msgid "Hifi"
 msgstr "sprzęt hifi"
 
 #. item
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2454
 msgid "Edit Hifi Shop"
 msgstr "Edycja sklepu ze sprzętem hi-fi"
 
 #. item "Shops/Hifi" text "Name"
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2458
 msgid "Furniture"
 msgstr "meble"
 
 #. item
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2459
 msgid "Edit Furniture Shop"
 msgstr "Edycja sklepu meblowego"
 
 #. item "Shops/Furniture" text "Name"
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2463
 msgid "Garden Centre"
 msgstr "centrum ogrodnicze"
@@ -16609,10 +16964,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 "Edycja centrum ogrodniczego"
 
 #. item "Shops/Garden Centre" text "Name"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2469
 msgid "Hardware"
 msgstr ""
@@ -16620,10 +16975,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 ""
 
 #. item "Shops/Hardware" text "Name"
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2475
 msgid "Do-it-yourself-store"
 msgstr "sklep DIY"
@@ -16631,60 +16986,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 "Edycja sklepu DIY (zrób to sam)"
 
 #. item "Shops/Do-it-yourself-store" text "Name"
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2481
 msgid "Stationery"
 msgstr "artykuły biurowe"
 
 #. item
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2482
 msgid "Edit Stationery Shop"
 msgstr "Edycja sklepu z artykułami biurowymi"
 
 #. item "Shops/Stationery" text "Name"
-#: build/trans_presets.java:2485
+#: build/trans_presets.java:2486
 msgid "Hairdresser"
 msgstr "fryzjer"
 
 #. item
-#: build/trans_presets.java:2486
+#: build/trans_presets.java:2487
 msgid "Edit Hairdresser"
 msgstr "Edycja salonu fryzjerskiego"
 
 #. item "Shops/Hairdresser" text "Name"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2491
 msgid "Shoes"
 msgstr "obuwie"
 
 #. item
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2492
 msgid "Edit Shoe Shop"
 msgstr "Edycja sklepu obuwniczego"
 
 #. item "Shops/Shoes" text "Name"
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2496
 msgid "Toys"
 msgstr "zabawki"
 
 #. item
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2497
 msgid "Edit Toy Shop"
 msgstr "Edycja sklepu z zabawkami"
 
 #. item "Shops/Toys" text "Name"
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2501
 msgid "Video"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2502
 msgid "Edit Video Shop"
 msgstr ""
 
 #. item "Shops/Video" text "Name"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2506
 msgid "Dry Cleaning"
 msgstr "pralnia chemiczna"
@@ -16692,10 +17047,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 "Edycja palni chemicznej"
 
 #. item "Shops/Dry Cleaning" text "Name"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2512
 msgid "Laundry"
 msgstr "pralnia samoobsługowa"
@@ -16703,10 +17058,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 "wyspa"
 
 #. item "Shops/Laundry" text "Name"
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2518
 msgid "Outdoor"
 msgstr "sklep turystyczny"
@@ -16714,35 +17069,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 "Edycja sklepu ze sprzętem turystycznym"
 
 #. item "Shops/Outdoor" text "Name"
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2524
 msgid "Sports"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2525
 msgid "Edit Sports Shop"
 msgstr "Edycja sklepu sportowego"
 
 #. item "Shops/Sports" text "Name"
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2529
 msgid "Optician"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2530
 msgid "Edit Optician"
 msgstr "Edycja optyka"
 
 #. item "Shops/Optician" text "Name"
-#: build/trans_presets.java:2535
+#: build/trans_presets.java:2536
 msgid "Cash"
 msgstr "Gotówka"
 
 #. group "Cash"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2537
 msgid "Bank"
 msgstr "bank"
@@ -16750,5 +17105,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 "Edycja banku"
@@ -16756,10 +17111,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 "bankomat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2544
 msgid "Money Exchange"
 msgstr "kantor"
@@ -16767,5 +17122,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 "Edycja kantoru"
@@ -16773,15 +17128,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 "Edycja bankomatu"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2557
 msgid "Health"
 msgstr "Zdrowie"
 
 #. group "Health"
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2558
 msgid "Doctors"
 msgstr "lekarz"
@@ -16789,20 +17144,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 "Edycja lekarza"
 
 #. item "Health/Doctors" text "Name"
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2564
 msgid "Dentist"
 msgstr "dentysta"
 
 #. item
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2565
 msgid "Edit Dentist"
 msgstr "Edycja dentysty"
 
 #. item "Health/Dentist" text "Name"
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2569
 msgid "Pharmacy"
 msgstr "apteka"
@@ -16810,5 +17165,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 "Edycja apteki"
@@ -16816,10 +17171,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 "realizacja recept"
 
 #. item "Health/Pharmacy" text "Name"
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2576
 msgid "Hospital"
 msgstr "szpital"
@@ -16827,10 +17182,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 "Edycja szpitala"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2582
 msgid "Emergency Access Point"
 msgstr ""
@@ -16839,5 +17194,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 ""
@@ -16846,20 +17201,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2588
 msgid "Point Number"
 msgstr "Numer punktu"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2589
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2591
 msgid "Phone Number"
 msgstr "Numer telefonu"
 
 #. 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 "(Podaj razem z kodem kraju, np.: +12-345-67890)"
@@ -16867,5 +17222,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 "weterynarz"
@@ -16874,25 +17229,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 "Edycja lecznicy weterynaryjnej"
 
 #. group "Places"
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2605
 msgid "Continent"
 msgstr "kontynent"
 
 #. item
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2606
 msgid "Edit Continent"
 msgstr "Edycja kontynentu"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2611
 msgid "Country"
 msgstr "kraj"
 
 #. item
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2612
 msgid "Edit Country"
 msgstr "Edycja kraju"
@@ -16900,30 +17255,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 "stan"
 
 #. item
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2618
 msgid "Edit State"
 msgstr "Edycja stanu"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2622
+#: build/trans_presets.java:2623
 msgid "Region"
 msgstr "region"
 
 #. item
-#: build/trans_presets.java:2623
+#: build/trans_presets.java:2624
 msgid "Edit Region"
 msgstr "Edycja regionu"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2628
+#: build/trans_presets.java:2629
 msgid "County"
 msgstr "okręg"
 
 #. item
-#: build/trans_presets.java:2629
+#: build/trans_presets.java:2630
 msgid "Edit County"
 msgstr "Edycja okręgu / hrabstwa"
@@ -16931,15 +17286,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2635
+#: build/trans_presets.java:2636
 msgid "City"
 msgstr "miasto"
 
 #. item
-#: build/trans_presets.java:2636
+#: build/trans_presets.java:2637
 msgid "Edit City"
 msgstr "Edycja miasta"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2641
+#: build/trans_presets.java:2642
 msgid "Town"
 msgstr "miejscowość"
@@ -16947,10 +17302,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 "Edycja miejscowości"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2649
 msgid "Suburb"
 msgstr "dzielnica"
@@ -16958,25 +17313,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 "Edycja dzielnicy"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2656
 msgid "Village"
 msgstr "wieś"
 
 #. item
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2657
 msgid "Edit Village"
 msgstr "Edycja wsi"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2662
 msgid "Hamlet"
 msgstr "wólka"
 
 #. item
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2663
 msgid "Edit Hamlet"
 msgstr "Edycja wólki"
@@ -16984,5 +17339,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2669
 msgid "Locality"
 msgstr "okolica"
@@ -16990,10 +17345,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 "Edycja okolicy"
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2676
 msgid "Island"
 msgstr "wyspa"
@@ -17001,5 +17356,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 "Edycja wyspy"
@@ -17007,5 +17362,5 @@
 #. item "Places/Island" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2683
+#: build/trans_presets.java:2684
 msgid "Cave Entrance"
 msgstr "wejście do jaskini"
@@ -17013,10 +17368,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 "Edycja wejścia do jaskini"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2690
 msgid "Peak"
 msgstr "wzgórze"
@@ -17024,10 +17379,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 "Edycja wzgórza"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2697
 msgid "Glacier"
 msgstr "lodowiec"
@@ -17035,10 +17390,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 "Edycja lodowca"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2703
+#: build/trans_presets.java:2704
 msgid "Volcano"
 msgstr "wulkan"
@@ -17046,70 +17401,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 "Edycja wulkanu"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2711
+#: build/trans_presets.java:2712
 msgid "Boundaries"
 msgstr "Granice"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2713
 msgid "National"
 msgstr "narodowa"
 
 #. item
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2714
 msgid "Edit National Boundary"
 msgstr "Edycja granicy narodowej"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2718
+#: build/trans_presets.java:2719
 msgid "Administrative"
 msgstr "administracyjna"
 
 #. item
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2720
 msgid "Edit Administrative Boundary"
 msgstr "Edycja granicy administracyjnej"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2724
+#: build/trans_presets.java:2725
 msgid "Civil"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2725
+#: build/trans_presets.java:2726
 msgid "Edit Civil Boundary"
 msgstr ""
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2730
+#: build/trans_presets.java:2731
 msgid "Political"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:2732
 msgid "Edit Political Boundary"
 msgstr "Edycja granicy politycznej"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2736
+#: build/trans_presets.java:2737
 msgid "National park"
 msgstr "park narodowy"
 
 #. item
-#: build/trans_presets.java:2737
+#: build/trans_presets.java:2738
 msgid "Edit National Park Boundary"
 msgstr "Edycja granicy parku narodowego"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2744
 msgid "Land use"
 msgstr "Zagospodarowanie terenu"
 
 #. group "Land use"
-#: build/trans_presets.java:2744
+#: build/trans_presets.java:2745
 msgid "Tree"
 msgstr "drzewo"
@@ -17118,15 +17473,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 "Edycja drzewa"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2753
 msgid "Botanical Name"
 msgstr "Nazwa systematyczna"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2755
 msgid "Wood"
 msgstr "las"
@@ -17135,5 +17490,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 "Edycja lasu"
@@ -17141,17 +17496,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 "iglasty"
 
-#: build/trans_presets.java:2760 build/trans_presets.java:2769
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
 msgid "deciduous"
 msgstr "liściasty"
 
-#: build/trans_presets.java:2760 build/trans_presets.java:2769
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
 msgid "mixed"
 msgstr "mieszany"
 
-#: build/trans_presets.java:2762
+#: build/trans_presets.java:2763
 msgid "Forest"
 msgstr "las"
@@ -17160,14 +17515,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 "Edycja lasu"
 
-#: build/trans_presets.java:2771
+#: build/trans_presets.java:2772
 msgid "Nature Reserve"
 msgstr "rezerwat przyrody"
 
 #. item
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2773
 msgid "Edit Nature Reserve"
 msgstr "Edycja rezerwatu przyrody"
@@ -17175,25 +17530,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2777
+#: build/trans_presets.java:2778
 msgid "Scree"
 msgstr "rumowisko"
 
 #. item
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:2779
 msgid "Edit Scree"
 msgstr "Edycja rumowiska"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2783
 msgid "Scrub"
 msgstr "busz"
 
 #. item
-#: build/trans_presets.java:2783
+#: build/trans_presets.java:2784
 msgid "Edit Scrub"
 msgstr "Edycja buszu"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2788
 msgid "Fell"
 msgstr "turnia"
@@ -17201,10 +17556,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 "Edycja turni"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2794
 msgid "Heath"
 msgstr "wrzosowisko"
@@ -17212,5 +17567,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 "Edycja wrzosowiska"
@@ -17218,5 +17573,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2801
 msgid "Farmyard"
 msgstr "zagroda"
@@ -17225,45 +17580,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 "Edycja zagrody"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2808
+#: build/trans_presets.java:2809
 msgid "Farmland"
 msgstr "grunty rolne"
 
 #. item
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2810
 msgid "Edit Farmland Landuse"
 msgstr "Edycja gruntów rolnych"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2814
+#: build/trans_presets.java:2815
 msgid "Meadow"
 msgstr "łąka"
 
 #. item
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2816
 msgid "Edit Meadow Landuse"
 msgstr "Edycja łąki"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2820
+#: build/trans_presets.java:2821
 msgid "Vineyard"
 msgstr "winnica"
 
 #. item
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2822
 msgid "Edit Vineyard Landuse"
 msgstr "Edycja winnicy"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2826
+#: build/trans_presets.java:2827
 msgid "Allotments"
 msgstr "ogródki działkowe"
 
 #. item
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:2828
 msgid "Edit Allotments Landuse"
 msgstr "Edycja ogródków działkowych"
@@ -17271,25 +17626,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2833
+#: build/trans_presets.java:2834
 msgid "Garden"
 msgstr "ogród"
 
 #. item
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2835
 msgid "Edit Garden"
 msgstr "Edycja ogrodu"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2838
+#: build/trans_presets.java:2839
 msgid "Grass"
 msgstr "Trawa"
 
 #. item
-#: build/trans_presets.java:2839
+#: build/trans_presets.java:2840
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2845
 msgid "Village Green"
 msgstr ""
@@ -17297,10 +17652,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 ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:2852
 msgid "Common"
 msgstr "miejsce publiczne"
@@ -17308,20 +17663,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 "Edycja miejsca publicznego"
 
 #. 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 "Edycja parku"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2863
 msgid "Recreation Ground"
 msgstr "Teren rekreacyjny"
@@ -17329,5 +17684,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 "Edycja terenu rekreacyjnego"
@@ -17335,15 +17690,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2871
 msgid "Residential area"
 msgstr "zabudowa mieszkaniowa"
 
 #. item
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2872
 msgid "Edit Residential Landuse"
 msgstr "Edycja zabudowy mieszkaniowej"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2877
 msgid "Graveyard"
 msgstr "cmentarz"
@@ -17351,9 +17706,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 "Edycja cmentarza"
 
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:2885
 msgid "Cemetery"
 msgstr "cmentarz"
@@ -17361,39 +17716,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 "Edycja cmentarza"
 
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2894
 msgid "Retail"
 msgstr "handel"
 
 #. item
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2895
 msgid "Edit Retail Landuse"
 msgstr "Edycja obszaru handlowego"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2900
 msgid "Commercial"
 msgstr "biura i usługi"
 
 #. item
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2901
 msgid "Edit Commercial Landuse"
 msgstr "Edycja obszaru biur i usług"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2906
 msgid "Industrial"
 msgstr "teren przemysłowy"
 
 #. item
-#: build/trans_presets.java:2906
+#: build/trans_presets.java:2907
 msgid "Edit Industrial Landuse"
 msgstr "Edycja terenu przemysłowego"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2912
 msgid "Railway land"
 msgstr "teren kolejowy"
@@ -17401,15 +17756,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 "Edycja terenu kolejowego"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:2919
 msgid "Military"
 msgstr "obszar wojskowy"
 
 #. item
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2920
 msgid "Edit Military Landuse"
 msgstr "Edycja obszaru wojskowego"
@@ -17417,55 +17772,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2925
+#: build/trans_presets.java:2926
 msgid "Construction area"
 msgstr "budowa"
 
 #. item
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2927
 msgid "Edit Construction Landuse"
 msgstr "Edycja terenu budowy"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2932
 msgid "Brownfield"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:2933
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2937
+#: build/trans_presets.java:2938
 msgid "Greenfield"
 msgstr "teren pod zabudowę"
 
 #. item
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:2939
 msgid "Edit Greenfield Landuse"
 msgstr "Edycja terenu pod zabudowę"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:2944
 msgid "Landfill"
 msgstr "wysypisko"
 
 #. item
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:2945
 msgid "Edit Landfill Landuse"
 msgstr "Edycja wysypiska śmieci"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2950
 msgid "Quarry"
 msgstr "kamieniołom"
 
 #. item
-#: build/trans_presets.java:2950
+#: build/trans_presets.java:2951
 msgid "Edit Quarry Landuse"
 msgstr "Edycja komieniołomu"
 
 #. group "Relations"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2960
 msgid "Multipolygon"
 msgstr ""
@@ -17475,5 +17830,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 ""
@@ -17482,10 +17837,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:2970
 msgid "outer segment"
 msgstr "zewnętrzny segment"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:2970
+#: build/trans_presets.java:2971
 msgid "inner segment"
 msgstr "wewnętrzny segment"
@@ -17493,5 +17848,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:2974
 msgid "Turn restriction"
 msgstr "ograniczenia skrętu"
@@ -17500,5 +17855,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 "Edycja ograniczenia skrętu"
@@ -17506,34 +17861,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 "Ograniczenie"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_left_turn"
 msgstr "brak skrętu w lewo"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_right_turn"
 msgstr "brak skrętu w prawo"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_straight_on"
 msgstr "zakaz jazdy prosto"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_u_turn"
 msgstr "zakaz zawracania"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "only_right_turn"
 msgstr "nakaz skrętu w prawo"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "only_left_turn"
 msgstr "nakaz skrętu w lewo"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "only_straight_on"
 msgstr "nakaz jazdy prosto"
@@ -17542,15 +17897,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2983
+#: build/trans_presets.java:2984
 msgid "from way"
 msgstr "z drogi"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2985
 msgid "via node or way"
 msgstr "przez węzeł lub drogę"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2986
 msgid "to way"
 msgstr "do drogi"
@@ -17558,5 +17913,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:2988
+#: build/trans_presets.java:2989
 msgid "Route"
 msgstr ""
@@ -17565,5 +17920,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 ""
@@ -17571,5 +17926,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 ""
@@ -17641,5 +17996,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
@@ -17648,17 +18003,17 @@
 msgstr ""
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "bus"
 msgstr ""
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "ferry"
 msgstr "prom"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "ski"
 msgstr ""
@@ -17711,5 +18066,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
@@ -17718,13 +18073,13 @@
 msgstr ""
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "hiking"
 msgstr ""
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "tram"
 msgstr "tramway"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "detour"
 msgstr "objazd"
@@ -17738,10 +18093,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 "metro"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:2997
 msgid "Symbol description"
 msgstr "Opis symboli"
@@ -17749,26 +18104,26 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:2999
+#: build/trans_presets.java:3000
 msgid "Network"
 msgstr "Sieć"
 
 #. item "Relations/Route" combo "State"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "proposed"
 msgstr "proponowany"
 
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "alternate"
 msgstr "alternatywny"
 
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "temporary"
 msgstr "tymczasowy"
 
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "connection"
 msgstr "połaczenie"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3003
 msgid "Color (hex)"
 msgstr "Kolor (hex)"
@@ -17777,30 +18132,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:3006
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3007
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3008
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3009
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3010
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3011
 msgid "backward halt point"
 msgstr ""
@@ -21915,9 +22270,28 @@
 msgstr ""
 
+#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
+#~ msgstr "Możesz użyć myszki lub Ctrl+strzałki/./ aby powiększać i przesuwać."
+
 #~ msgid "Uploading data"
 #~ msgstr "Przesyłanie danych"
 
+#~ msgid "Email"
+#~ msgstr "E-mail"
+
+#~ msgid "Login name (email) to the OSM account."
+#~ msgstr "Login (adres email) konta OSM"
+
+#~ msgid "OSM username (email)"
+#~ msgstr "Użytkownik OSM (email)"
+
 #~ msgid "Unknown host"
 #~ msgstr "Nieznany adres"
+
+#~ msgid ""
+#~ "Server returned internal error. Try a reduced area or retry after waiting "
+#~ "some time."
+#~ msgstr ""
+#~ "Serwer zgłosił błąd wewnętrzny. Spróbuj zmniejszyć obszar lub spróbować "
+#~ "po chwili."
 
 #~ msgid "Commit comment"
@@ -21965,4 +22339,14 @@
 #~ msgid "Really mark this issue as ''done''?"
 #~ msgstr "Czy na pewno oznaczyć ten problem jako \"załatwiony\"?"
+
+#~ 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 URL.<br><b>Do not use a valuable Password.</b></html>"
+#~ msgstr ""
+#~ "<html>UWAGA: Hasło jest zapisywane otwartym tekstem w pliku ustawień."
+#~ "<br>Hasło jest przesyłane otwartym tekstem podczas połączenia z serwerem "
+#~ "i jest częścią adresu.<br><b>Nie należy używać żadnych wartościowych "
+#~ "haseł</b></html>"
 
 #~ msgid "Portcullis"
@@ -21990,4 +22374,8 @@
 #~ msgstr "Wiadukt"
 
+#~ msgid "Open the OpenStreetBugs window and activate the automatic download"
+#~ msgstr ""
+#~ "Otwiera okno OpenStreetBugs i aktywuje automatyczne pobieranie danych"
+
 #~ msgid "The projection could not be read from preferences. Using EPSG:4326"
 #~ msgstr ""
@@ -22000,4 +22388,12 @@
 #~ msgstr "Usuń i pobierz"
 
+#~ msgid ""
+#~ "This action will require {0} individual download requests. Do you wish to "
+#~ "continue?"
+#~ msgstr "Ta akcja wymaga wykonania {0} pobrań danych. Kontynuować?"
+
+#~ msgid "The following errors occured during mass download:"
+#~ msgstr "Podczas pobierania wystąpiły następujące błędy:"
+
 #~ msgid "Edit Drawbridge"
 #~ msgstr "Edycja mostu zwodzonego"
@@ -22005,2 +22401,13 @@
 #~ msgid "Edit Portcullis"
 #~ msgstr "Edycja brony"
+
+#~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">english</A>."
+#~ msgstr ""
+#~ "Brak strony pomocy. Możesz ją utworzyć po <a href=\"{0}\">angielsku</a>."
+
+#~ msgid ""
+#~ "Helppage missing. Create it in <A HREF=\"{0}\">english</A> or <A HREF="
+#~ "\"{1}\">your language</A>."
+#~ msgstr ""
+#~ "Brak strony pomocy. Możesz ją utworzyć po <a href=\"{0}\">angielsku</a> "
+#~ "lub <A HREF=\"{1}\">po polsku</A>."
Index: applications/editors/josm/i18n/po/ro.po
===================================================================
--- applications/editors/josm/i18n/po/ro.po	(revision 16008)
+++ applications/editors/josm/i18n/po/ro.po	(revision 16009)
@@ -8,6 +8,6 @@
 "Project-Id-Version: JOSM\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-14 16:51+0200\n"
-"PO-Revision-Date: 2009-06-09 17:50+0000\n"
+"POT-Creation-Date: 2009-06-19 21:52+0200\n"
+"PO-Revision-Date: 2009-06-14 17:16+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Romanian <gnomero-list@lists.sourceforge.net>\n"
@@ -17,5 +17,5 @@
 "Plural-Forms: nplurals=3; plural=(n == 1 ? 0: (((n % 100 > 19) || ((n % 100 "
 "== 0) && (n != 0))) ? 2: 1));\n"
-"X-Launchpad-Export-Date: 2009-06-14 14:45+0000\n"
+"X-Launchpad-Export-Date: 2009-06-19 19:35+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: ROMANIA\n"
@@ -31,11 +31,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 "Ajutor"
 
 #: ../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 "Proiecţia nu a putut fi citită din preferinţe. Se utilizează Mercator"
 
@@ -76,6 +76,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
@@ -92,8 +94,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
@@ -142,5 +144,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"
@@ -537,5 +539,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}"
@@ -605,6 +607,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:92
-msgid "Email"
-msgstr "Email"
+msgid "E-Mail"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:96
@@ -640,12 +642,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
@@ -672,5 +676,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
@@ -703,5 +707,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:207
 #, java-format
-msgid "Helppage missing. Create it in <A HREF=\"{0}\">english</A>."
+msgid "Help page missing. Create it in <A HREF=\"{0}\">english</A>."
 msgstr ""
 
@@ -709,5 +713,5 @@
 #, 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 ""
@@ -1127,13 +1131,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:99
 msgid "Status Report"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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
@@ -1318,102 +1322,272 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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?"
 msgstr ""
 
-#: ../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 ""
-
-#: ../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 "Despre JOSM..."
 
-#: ../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 "Trimite toate schimbările la serverul OSM."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:96
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:94
 msgid "Objects to add:"
 msgstr "Obiecte de adăugat:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102
 msgid "Objects to modify:"
 msgstr "Obiecte de modificat:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:110
 msgid "Objects to delete:"
 msgstr "Obiecte de şters:"
 
-#: ../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 ""
 
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:126
+msgid "Upload these changes?"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
-msgid "Upload these changes?"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:130
 msgid "Upload Changes"
 msgstr ""
 
-#: ../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 "Nimic de transmis. Mai întâi obţineţi nişte date."
 
-#: ../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 "Există conflicte nerezolvate. Mai întâi trebuie să le rezolvaţi."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:182
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:180
 msgid "No changes to upload."
 msgstr "Nu sunt schimbări de transmis."
 
-#: ../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 ""
@@ -1518,36 +1692,50 @@
 msgstr "Date GPS neprelucrate"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:44
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:46
 msgid "Downloading data"
 msgstr "Descarc date"
 
-#: ../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 "Nu au fost importate date."
 
-#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:83
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:88
 msgid "OpenStreetMap data"
 msgstr "Date OpenStreetMap"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:37
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:45
 msgid "Data Layer"
 msgstr "Strat de date"
 
-#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:88
-msgid "The following errors occured during mass download:"
-msgstr ""
-
-#: ../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 ""
+
+#: ../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 ""
 
@@ -1599,34 +1787,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 "Adaugă nod"
 
-#: ../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 ""
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:500
+msgid "Connect existing way to node"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:502
-msgid "Connect existing way to node"
+msgid "Add a new node to an existing way"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:504
-msgid "Add a new node to an existing way"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:506
 msgid "Add node into way and connect"
 msgstr ""
 
-#: ../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 ""
 
+#: ../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 ""
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:888
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:910
-msgid "Select node under cursor."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890
 #, java-format
 msgid "Insert new node into way."
@@ -1635,14 +1823,14 @@
 msgstr[1] ""
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:897
+msgid "Start new way from last node."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:899
-msgid "Start new way from last node."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:901
 msgid "Continue way from last node."
 msgstr ""
 
-#: ../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 ""
@@ -1951,25 +2139,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 "Încarcă selecţia"
 
-#: ../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 "Contactez {0}..."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:45
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:46
 msgid "Downloading..."
 msgstr "Descarc..."
 
-#: ../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 ""
 
@@ -2032,13 +2226,78 @@
 msgstr "Rezolvă {0} conflicte în {1} obiecte"
 
-#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97
+#, java-format
+msgid "Delete {0} {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153
+msgid "Conflicting relation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147
+#, java-format
+msgid ""
+"Selection \"{0}\" is used by relation \"{1}\" with role {2}.\n"
+"Delete from relation?"
+msgstr ""
+
+#: ../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 "Mută"
+
 #: ../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"
@@ -2048,10 +2307,217 @@
 msgstr[2] "de noduri"
 
-#: ../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 "Secvenţă"
+
+#: ../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 ""
+
+#: ../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 "diferit"
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:262
+msgid "deleted"
+msgstr "şters"
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
+msgid "true"
+msgstr "adevărat"
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
+msgid "false"
+msgstr "fals"
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20
+msgid "position"
+msgstr "poziţie"
+
+#: ../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 "incomplet"
+
+#: ../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"
@@ -2061,8 +2527,10 @@
 msgstr[2] "de căi"
 
-#: ../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
@@ -2073,256 +2541,27 @@
 msgstr[1] ""
 
-#: ../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 ""
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97
-#, java-format
-msgid "Delete {0} {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153
-msgid "Conflicting relation"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147
-#, java-format
-msgid ""
-"Selection \"{0}\" is used by relation \"{1}\" with role {2}.\n"
-"Delete from relation?"
-msgstr ""
-
-#: ../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 "Mută"
-
-#: ../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 "Secvenţă"
-
-#: ../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 ""
-
-#: ../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 "diferit"
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:262
-msgid "deleted"
-msgstr "şters"
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
-msgid "true"
-msgstr "adevărat"
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
-msgid "false"
-msgstr "fals"
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20
-msgid "position"
-msgstr "poziţie"
-
-#: ../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 "incomplet"
-
-#: ../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"
@@ -2336,5 +2575,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:122
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "railway"
 msgstr ""
@@ -2356,4 +2595,62 @@
 msgstr[1] ""
 
+#: ../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."
@@ -2501,5 +2798,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 "fundal"
@@ -2572,8 +2869,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
@@ -2585,7 +2882,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
@@ -2687,10 +2984,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 "Nume utilizator"
 
 #: ../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 "Parolă"
@@ -2787,22 +3084,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:146
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148
 msgid "File"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150
 msgid "View"
 msgstr "Vizualizare"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:149
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151
 msgid "Tools"
 msgstr "Unelte"
 
-#: ../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 ""
 
-#: ../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
@@ -2815,21 +3112,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 ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:218
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221
 msgid "Toggle Wireframe view"
 msgstr ""
 
-#: ../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 ""
@@ -2901,6 +3198,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 "stratul nu este în listă."
@@ -2910,9 +3207,9 @@
 msgstr "Contactez serverul OSM..."
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:104
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:105
 msgid "Error while parsing"
 msgstr "Eroare la prelucrare"
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:107
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:108
 msgid "File not found"
 msgstr ""
@@ -2984,5 +3281,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 ""
@@ -3178,5 +3475,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
@@ -3258,5 +3555,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 ""
@@ -3295,5 +3592,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 ""
 
@@ -3347,5 +3644,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 ""
@@ -3449,5 +3746,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
@@ -3763,5 +4060,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 ""
@@ -3866,66 +4163,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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
@@ -3970,5 +4267,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
@@ -3989,9 +4286,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
@@ -4013,30 +4310,33 @@
 #: 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 ""
 
-#: ../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 "Au existat conflicte în timpul importului."
 
-#: ../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 ""
 
-#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:562
+msgid "Error when communicating with server."
 msgstr ""
 
@@ -4101,17 +4401,17 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:174
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:173
 msgid "Download Area"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
@@ -4139,5 +4439,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 ""
@@ -4184,21 +4484,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 ""
@@ -4237,14 +4537,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:84
 msgid "Tile Numbers"
-msgstr ""
-
-#: ../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 ""
-
-#. 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 ""
 
@@ -4325,5 +4615,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)"
@@ -4439,14 +4729,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 "Importă imagini"
 
-#: ../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, "
@@ -4455,5 +4745,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, "
@@ -4462,5 +4752,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"
@@ -4469,28 +4759,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 "Converteşte la strat de date"
 
-#: ../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 ""
@@ -4499,11 +4789,11 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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
@@ -4513,29 +4803,29 @@
 msgstr ""
 
-#: ../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 ""
@@ -4544,9 +4834,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 "
@@ -4554,5 +4844,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 "
@@ -4560,33 +4850,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 "{0} constă în:"
 
-#: ../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} şters.)"
 
-#: ../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"
@@ -4594,21 +4893,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"
@@ -4755,5 +5054,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
@@ -4762,5 +5061,5 @@
 msgstr "Vă rog selectaţi rândul care va fi editat."
 
-#: ../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
@@ -4768,5 +5067,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
@@ -4776,5 +5075,5 @@
 msgstr "Vă rog selectaţi rândul care va fi şters."
 
-#: ../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 ""
@@ -5651,106 +5950,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 "Nume"
@@ -6218,6 +6517,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:36
-msgid "Login name (email) to the OSM account."
-msgstr "Nume autentificare (email) pentru contul OSM."
+msgid "Login name (e-mail) to the OSM account."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
@@ -6233,6 +6532,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
-msgid "OSM username (email)"
-msgstr "Nume utilizator OSM (email)"
+msgid "OSM username (e-mail)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
@@ -6243,5 +6542,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 ""
@@ -6536,6 +6835,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 ""
@@ -6546,7 +6846,7 @@
 msgstr "Descarc punctele {0} până la {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 "Descarc datele OSM..."
@@ -6611,15 +6911,14 @@
 msgstr ""
 
-#: ../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 ""
@@ -6628,31 +6927,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 ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:351
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298
 msgid "Closing changeset..."
 msgstr ""
 
-#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:381
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:326
 msgid "Uploading..."
 msgstr ""
@@ -6667,25 +6972,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 "Parolă sau nume utilizator incorecte."
 
-#: ../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 "Atenţie: Parola este transferată necriptată."
 
-#: ../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 "Salvează nume utilizator şi parolă (necriptate)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:89
 msgid "Enter Password"
 msgstr "Introduceţi parola"
 
-#: ../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..."
@@ -6696,4 +7001,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."
@@ -6786,24 +7134,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 ""
 
-#: ../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 ""
 
-#: ../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 ""
-
-#: ../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 ""
 
@@ -6819,5 +7175,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 ""
@@ -6989,9 +7345,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:127
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
 msgid "Download missing plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:128
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:119
 #, java-format
 msgid ""
@@ -7001,6 +7357,6 @@
 msgstr ""
 
+#: ../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
@@ -7023,35 +7379,35 @@
 msgstr "necunoscut"
 
-#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:202
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:193
 msgid "Plugin bundled with JOSM"
 msgstr ""
 
-#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:329
+#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:340
 msgid "Error playing sound"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
 msgid "Do nothing"
 msgstr "Nu fă nimic"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
 msgid "Report Bug"
 msgstr "Raportează eroarea"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:52
 msgid ""
 "An unexpected exception occurred.\n"
@@ -7061,18 +7417,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55
 msgid "Unexpected Exception"
 msgstr "Excepţie netratată"
 
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66
+#, java-format
+msgid "Please report a ticket at {0}"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:67
-#, java-format
-msgid "Please report a ticket at {0}"
+msgid "Include your steps to get to the error (as detailed as possible)!"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:68
-msgid "Include your steps to get to the error (as detailed as possible)!"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69
 msgid ""
 "Try updating to the newest version of JOSM and all plugins before reporting "
@@ -7080,9 +7436,9 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
@@ -7159,5 +7515,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 ""
@@ -7524,5 +7880,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 ""
@@ -7556,5 +7912,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"
@@ -7577,5 +7932,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
@@ -7666,6 +8021,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/"
@@ -7741,6 +8096,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
@@ -7748,11 +8103,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 ""
@@ -7769,13 +8124,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 ""
@@ -7796,5 +8151,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 ""
 
@@ -7887,5 +8242,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
@@ -7893,59 +8248,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 ""
@@ -7954,14 +8278,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 ""
@@ -8056,11 +8380,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 ""
@@ -8070,5 +8394,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 ""
@@ -8355,4 +8679,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 ""
 
@@ -8664,42 +8992,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 ""
@@ -8756,5 +9084,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 ""
 
@@ -8830,5 +9158,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 "
@@ -8836,9 +9164,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 ""
@@ -9265,5 +9593,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 ""
@@ -9353,5 +9681,5 @@
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:195
-msgid "No intersections found. Nothing was changed."
+msgid "No intersection found. Nothing was changed."
 msgstr ""
 
@@ -10214,19 +10542,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 ""
@@ -10285,5 +10612,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113
 #, java-format
 msgid ""
@@ -10325,4 +10652,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 ""
 
@@ -10414,4 +10766,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 ""
@@ -10426,5 +10783,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 ""
 
@@ -10708,5 +11065,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 ""
@@ -11208,5 +11565,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 ""
@@ -11675,7 +12032,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 ""
@@ -12291,10 +12648,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 ""
@@ -12506,7 +12863,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 ""
@@ -13438,5 +13795,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 ""
@@ -13572,5 +13929,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 ""
@@ -13578,5 +13935,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 ""
@@ -13628,11 +13985,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 ""
@@ -13640,5 +14007,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1512
+#: build/trans_presets.java:1513
 msgid "Taxi"
 msgstr ""
@@ -13646,5 +14013,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 ""
@@ -13652,5 +14019,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1519
+#: build/trans_presets.java:1520
 msgid "Airport"
 msgstr ""
@@ -13658,15 +14025,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 ""
@@ -13675,5 +14042,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1532
+#: build/trans_presets.java:1533
 msgid "Accomodation"
 msgstr ""
@@ -13685,5 +14052,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 ""
@@ -13692,15 +14059,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 ""
@@ -13708,20 +14075,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 ""
@@ -13729,10 +14096,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 ""
@@ -13740,30 +14107,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 ""
@@ -13771,10 +14138,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 ""
@@ -13785,5 +14152,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 ""
@@ -13791,5 +14158,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 ""
@@ -13797,5 +14164,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 ""
@@ -13803,61 +14170,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 ""
@@ -13865,9 +14232,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 ""
@@ -13875,10 +14242,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 ""
@@ -13886,20 +14253,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 ""
@@ -13907,10 +14274,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 ""
@@ -13918,20 +14285,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 ""
@@ -13940,11 +14307,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 ""
@@ -13952,10 +14319,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 ""
@@ -13964,10 +14331,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 ""
@@ -13975,25 +14342,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 ""
@@ -14001,5 +14368,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 ""
@@ -14007,5 +14374,5 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1667
 msgid "Information Office"
 msgstr ""
@@ -14013,83 +14380,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 ""
+
 #. 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 ""
@@ -14097,25 +14461,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 ""
@@ -14124,20 +14488,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 ""
@@ -14146,10 +14510,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 ""
@@ -14157,5 +14521,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 ""
@@ -14163,15 +14527,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 ""
@@ -14179,45 +14543,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 ""
@@ -14225,15 +14589,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 ""
@@ -14241,15 +14605,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 ""
@@ -14263,6 +14627,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 ""
@@ -14638,6 +15002,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
@@ -14670,227 +15034,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 ""
@@ -14929,191 +15293,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 ""
@@ -15121,56 +15485,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 ""
 
 #. 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 ""
 
-#: 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 ""
 
-#: 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 ""
@@ -15178,178 +15542,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 ""
 
 #. item
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:1960
 msgid "Edit Baseball"
 msgstr ""
 
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:1965
 msgid "Basketball"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:1966
 msgid "Edit Basketball"
 msgstr ""
 
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:1971
 msgid "Golf"
 msgstr ""
 
 #. 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 ""
 
 #. item
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:1990
 msgid "Edit Cricket"
 msgstr ""
 
-#: 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 ""
 
 #. item
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2026
 msgid "Edit Rugby"
 msgstr ""
 
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:2031
 msgid "Table Tennis"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2032
 msgid "Edit Table Tennis"
 msgstr ""
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2037
 msgid "Tennis"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2037
+#: build/trans_presets.java:2038
 msgid "Edit Tennis"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2044
+#: build/trans_presets.java:2045
 msgid "Buildings"
 msgstr ""
 
 #. group "Buildings"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2046
 msgid "Building"
 msgstr ""
@@ -15357,5 +15721,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2049
 msgid "Public Building"
 msgstr ""
@@ -15363,10 +15727,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 ""
@@ -15374,10 +15738,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 ""
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2061
 msgid "Embassy"
 msgstr ""
@@ -15385,10 +15749,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 ""
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2066
+#: build/trans_presets.java:2067
 msgid "Courthouse"
 msgstr ""
@@ -15397,10 +15761,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 ""
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2074
 msgid "Prison"
 msgstr ""
@@ -15409,10 +15773,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 ""
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2080
+#: build/trans_presets.java:2081
 msgid "Police"
 msgstr ""
@@ -15422,10 +15786,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 ""
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2089
 msgid "Fire Station"
 msgstr ""
@@ -15434,10 +15798,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 ""
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2096
 msgid "Post Office"
 msgstr ""
@@ -15445,5 +15809,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 ""
@@ -15451,15 +15815,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2103
 msgid "Kindergarten"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2103
+#: build/trans_presets.java:2104
 msgid "Edit Kindergarten"
 msgstr ""
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2108
 msgid "School"
 msgstr ""
@@ -15467,10 +15831,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 ""
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2114
 msgid "University"
 msgstr ""
@@ -15478,10 +15842,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 ""
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2120
 msgid "College"
 msgstr ""
@@ -15489,5 +15853,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 ""
@@ -15495,5 +15859,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2126
+#: build/trans_presets.java:2127
 msgid "Cinema"
 msgstr ""
@@ -15502,10 +15866,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 ""
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2133
+#: build/trans_presets.java:2134
 msgid "Library"
 msgstr ""
@@ -15514,10 +15878,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 ""
 
 #. item "Buildings/Library" text "Name"
-#: build/trans_presets.java:2140
+#: build/trans_presets.java:2141
 msgid "Arts Centre"
 msgstr ""
@@ -15525,10 +15889,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 ""
@@ -15537,10 +15901,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 ""
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2154
 msgid "Place of Worship"
 msgstr ""
@@ -15550,5 +15914,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 ""
@@ -15557,6 +15921,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 ""
@@ -15565,66 +15929,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
-msgid "bahai"
-msgstr ""
-
-#: build/trans_presets.java:2160 build/trans_presets.java:2881
-#: build/trans_presets.java:2890
-msgid "buddhist"
-msgstr ""
-
-#: build/trans_presets.java:2160 build/trans_presets.java:2881
-#: build/trans_presets.java:2890
-msgid "christian"
-msgstr ""
-
-#: build/trans_presets.java:2160 build/trans_presets.java:2881
-#: build/trans_presets.java:2890
-msgid "hindu"
-msgstr ""
-
-#: build/trans_presets.java:2160 build/trans_presets.java:2881
-#: build/trans_presets.java:2890
-msgid "jain"
-msgstr ""
-
-#: build/trans_presets.java:2160 build/trans_presets.java:2881
-#: build/trans_presets.java:2890
-msgid "jewish"
-msgstr ""
-
-#: build/trans_presets.java:2160 build/trans_presets.java:2881
-#: build/trans_presets.java:2890
-msgid "muslim"
-msgstr ""
-
-#: build/trans_presets.java:2160 build/trans_presets.java:2881
-#: build/trans_presets.java:2890
-msgid "sikh"
-msgstr ""
-
-#: build/trans_presets.java:2160 build/trans_presets.java:2881
-#: build/trans_presets.java:2890
-msgid "spiritualist"
-msgstr ""
-
-#: build/trans_presets.java:2160 build/trans_presets.java:2881
-#: build/trans_presets.java:2890
-msgid "taoist"
-msgstr ""
-
-#: build/trans_presets.java:2160 build/trans_presets.java:2881
-#: build/trans_presets.java:2890
-msgid "unitarian"
-msgstr ""
-
-#: build/trans_presets.java:2160 build/trans_presets.java:2881
-#: build/trans_presets.java:2890
-msgid "zoroastrian"
-msgstr ""
-
 #: build/trans_presets.java:2161 build/trans_presets.java:2882
 #: build/trans_presets.java:2891
+msgid "bahai"
+msgstr ""
+
+#: build/trans_presets.java:2161 build/trans_presets.java:2882
+#: build/trans_presets.java:2891
+msgid "buddhist"
+msgstr ""
+
+#: build/trans_presets.java:2161 build/trans_presets.java:2882
+#: build/trans_presets.java:2891
+msgid "christian"
+msgstr ""
+
+#: build/trans_presets.java:2161 build/trans_presets.java:2882
+#: build/trans_presets.java:2891
+msgid "hindu"
+msgstr ""
+
+#: build/trans_presets.java:2161 build/trans_presets.java:2882
+#: build/trans_presets.java:2891
+msgid "jain"
+msgstr ""
+
+#: build/trans_presets.java:2161 build/trans_presets.java:2882
+#: build/trans_presets.java:2891
+msgid "jewish"
+msgstr ""
+
+#: build/trans_presets.java:2161 build/trans_presets.java:2882
+#: build/trans_presets.java:2891
+msgid "muslim"
+msgstr ""
+
+#: build/trans_presets.java:2161 build/trans_presets.java:2882
+#: build/trans_presets.java:2891
+msgid "sikh"
+msgstr ""
+
+#: build/trans_presets.java:2161 build/trans_presets.java:2882
+#: build/trans_presets.java:2891
+msgid "spiritualist"
+msgstr ""
+
+#: build/trans_presets.java:2161 build/trans_presets.java:2882
+#: build/trans_presets.java:2891
+msgid "taoist"
+msgstr ""
+
+#: build/trans_presets.java:2161 build/trans_presets.java:2882
+#: build/trans_presets.java:2891
+msgid "unitarian"
+msgstr ""
+
+#: build/trans_presets.java:2161 build/trans_presets.java:2882
+#: build/trans_presets.java:2891
+msgid "zoroastrian"
+msgstr ""
+
+#: build/trans_presets.java:2162 build/trans_presets.java:2883
+#: build/trans_presets.java:2892
 msgid "Denomination"
 msgstr ""
@@ -15633,81 +15997,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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
@@ -15716,5 +16080,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 ""
@@ -15722,5 +16086,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2169
+#: build/trans_presets.java:2170
 msgid "House number"
 msgstr ""
@@ -15728,20 +16092,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2172
 msgid "House name"
 msgstr ""
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2174
 msgid "City name"
 msgstr ""
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2174
+#: build/trans_presets.java:2175
 msgid "Post code"
 msgstr ""
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2176
 msgid "Country code"
 msgstr ""
@@ -15749,5 +16113,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2179
 msgid "Address Interpolation"
 msgstr ""
@@ -15756,5 +16120,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 ""
@@ -15762,71 +16126,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 ""
 
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2184
 msgid "even"
 msgstr ""
 
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2184
 msgid "all"
 msgstr ""
 
-#: 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 ""
 
 #. group "Man Made"
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2188
 msgid "Works"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2189
 msgid "Edit Works"
 msgstr ""
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2193
 msgid "Tower"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2194
 msgid "Edit Tower"
 msgstr ""
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2198
 msgid "Water Tower"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2199
 msgid "Edit Water Tower"
 msgstr ""
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2203
 msgid "Gasometer"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2204
 msgid "Edit Gasometer"
 msgstr ""
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2207
+#: build/trans_presets.java:2208
 msgid "Lighthouse"
 msgstr ""
@@ -15834,10 +16198,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 ""
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2214
 msgid "Windmill"
 msgstr ""
@@ -15845,10 +16209,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 ""
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2220
 msgid "Pipeline"
 msgstr ""
@@ -15856,10 +16220,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 ""
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2225
+#: build/trans_presets.java:2226
 msgid "Wastewater Plant"
 msgstr ""
@@ -15869,10 +16233,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 ""
@@ -15880,10 +16244,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 ""
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2239
+#: build/trans_presets.java:2240
 msgid "Beacon"
 msgstr ""
@@ -15891,10 +16255,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 ""
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2245
+#: build/trans_presets.java:2246
 msgid "Survey Point"
 msgstr ""
@@ -15902,10 +16266,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 ""
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2252
 msgid "Surveillance"
 msgstr ""
@@ -15913,5 +16277,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 ""
@@ -15919,5 +16283,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2258
+#: build/trans_presets.java:2259
 msgid "Power Generator"
 msgstr ""
@@ -15927,39 +16291,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 ""
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "wind"
 msgstr ""
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "hydro"
 msgstr ""
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "fossil"
 msgstr ""
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "nuclear"
 msgstr ""
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "coal"
 msgstr ""
 
-#: 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 ""
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2268
 msgid "Power Station"
 msgstr ""
@@ -15968,10 +16332,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 ""
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2274
+#: build/trans_presets.java:2275
 msgid "Power Sub Station"
 msgstr ""
@@ -15980,5 +16344,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 ""
@@ -15986,10 +16350,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 ""
@@ -16000,5 +16364,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 ""
@@ -16006,5 +16370,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 ""
@@ -16013,25 +16377,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 ""
 
 #. 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 ""
@@ -16039,20 +16403,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 ""
 
 #. 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 ""
@@ -16061,5 +16425,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 ""
@@ -16067,5 +16431,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 ""
@@ -16073,5 +16437,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 ""
@@ -16079,5 +16443,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 ""
@@ -16085,5 +16449,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 ""
@@ -16091,15 +16455,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 ""
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2328
 msgid "Telephone cards"
 msgstr ""
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2330
 msgid "Recycling"
 msgstr ""
@@ -16108,5 +16472,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 ""
@@ -16114,35 +16478,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 ""
 
 #. 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 ""
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2338
 msgid "Glass"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2339
 msgid "Paper"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2340
 msgid "Scrap Metal"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2342
 msgid "Bench"
 msgstr ""
@@ -16151,20 +16515,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 ""
 
 #. item
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2347
 msgid "Edit Hunting Stand"
 msgstr ""
 
 #. item "Amenities/Hunting Stand" check "Shelter"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2350
 msgid "Hide"
 msgstr ""
 
 #. item "Amenities/Hunting Stand" check "Hide"
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2351
 msgid "Lock"
 msgstr ""
@@ -16172,22 +16536,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 ""
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2351
+#: build/trans_presets.java:2352
 msgid "low"
 msgstr ""
 
-#: build/trans_presets.java:2351
+#: build/trans_presets.java:2352
 msgid "half"
 msgstr ""
 
-#: build/trans_presets.java:2351
+#: build/trans_presets.java:2352
 msgid "full"
 msgstr ""
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2354
 msgid "Fountain"
 msgstr ""
@@ -16196,10 +16560,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 ""
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2361
 msgid "Drinking Water"
 msgstr ""
@@ -16208,10 +16572,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 ""
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2367
+#: build/trans_presets.java:2368
 msgid "Baby Hatch"
 msgstr ""
@@ -16219,25 +16583,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 ""
 
 #. group "Shops"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2377
 msgid "Supermarket"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2378
 msgid "Edit Supermarket"
 msgstr ""
 
 #. item "Shops/Supermarket" text "Name"
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:2382
 msgid "Convenience Store"
 msgstr ""
@@ -16245,10 +16609,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 ""
@@ -16256,10 +16620,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 ""
 
 #. item "Shops/Kiosk" text "Name"
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2394
 msgid "Vending machine"
 msgstr ""
@@ -16267,5 +16631,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 ""
@@ -16273,88 +16637,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 ""
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "public_transport_plans"
 msgstr ""
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "parking_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "food"
 msgstr ""
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "drinks"
 msgstr ""
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "sweets"
 msgstr ""
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "cigarettes"
 msgstr ""
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "photos"
 msgstr ""
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "animal_food"
 msgstr ""
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "news_papers"
 msgstr ""
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "toys"
 msgstr ""
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "stamps"
 msgstr ""
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "SIM-cards"
 msgstr ""
 
-#: 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 ""
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "tampons"
 msgstr ""
 
-#: 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 ""
@@ -16362,10 +16726,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 ""
 
 #. item "Shops/Butcher" text "Name"
-#: build/trans_presets.java:2414
+#: build/trans_presets.java:2415
 msgid "Baker"
 msgstr ""
@@ -16373,10 +16737,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 ""
 
 #. item "Shops/Baker" text "Name"
-#: build/trans_presets.java:2420
+#: build/trans_presets.java:2421
 msgid "Florist"
 msgstr ""
@@ -16384,20 +16748,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 ""
 
 #. 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 ""
@@ -16405,60 +16769,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 ""
 
 #. 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 ""
 
 #. item
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2444
 msgid "Edit Computer Shop"
 msgstr ""
 
 #. item "Shops/Computer" text "Name"
-#: build/trans_presets.java:2447
+#: build/trans_presets.java:2448
 msgid "Electronics"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2448
+#: build/trans_presets.java:2449
 msgid "Edit Electronics Shop"
 msgstr ""
 
 #. 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 ""
 
 #. item
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2459
 msgid "Edit Furniture Shop"
 msgstr ""
 
 #. item "Shops/Furniture" text "Name"
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2463
 msgid "Garden Centre"
 msgstr ""
@@ -16466,10 +16830,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 ""
 
 #. item "Shops/Garden Centre" text "Name"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2469
 msgid "Hardware"
 msgstr ""
@@ -16477,10 +16841,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 ""
 
 #. item "Shops/Hardware" text "Name"
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2475
 msgid "Do-it-yourself-store"
 msgstr ""
@@ -16488,60 +16852,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 ""
 
 #. item
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2482
 msgid "Edit Stationery Shop"
 msgstr ""
 
 #. item "Shops/Stationery" text "Name"
-#: build/trans_presets.java:2485
+#: build/trans_presets.java:2486
 msgid "Hairdresser"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2486
+#: build/trans_presets.java:2487
 msgid "Edit Hairdresser"
 msgstr ""
 
 #. item "Shops/Hairdresser" text "Name"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2491
 msgid "Shoes"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2492
 msgid "Edit Shoe Shop"
 msgstr ""
 
 #. item "Shops/Shoes" text "Name"
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2496
 msgid "Toys"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2497
 msgid "Edit Toy Shop"
 msgstr ""
 
 #. item "Shops/Toys" text "Name"
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2501
 msgid "Video"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2502
 msgid "Edit Video Shop"
 msgstr ""
 
 #. item "Shops/Video" text "Name"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2506
 msgid "Dry Cleaning"
 msgstr ""
@@ -16549,10 +16913,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 ""
 
 #. item "Shops/Dry Cleaning" text "Name"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2512
 msgid "Laundry"
 msgstr ""
@@ -16560,10 +16924,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 ""
 
 #. item "Shops/Laundry" text "Name"
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2518
 msgid "Outdoor"
 msgstr ""
@@ -16571,35 +16935,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 ""
 
 #. item "Shops/Outdoor" text "Name"
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2524
 msgid "Sports"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2525
 msgid "Edit Sports Shop"
 msgstr ""
 
 #. item "Shops/Sports" text "Name"
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2529
 msgid "Optician"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2530
 msgid "Edit Optician"
 msgstr ""
 
 #. item "Shops/Optician" text "Name"
-#: build/trans_presets.java:2535
+#: build/trans_presets.java:2536
 msgid "Cash"
 msgstr ""
 
 #. group "Cash"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2537
 msgid "Bank"
 msgstr ""
@@ -16607,5 +16971,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 ""
@@ -16613,10 +16977,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 ""
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2544
 msgid "Money Exchange"
 msgstr ""
@@ -16624,5 +16988,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 ""
@@ -16630,15 +16994,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 ""
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2557
 msgid "Health"
 msgstr ""
 
 #. group "Health"
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2558
 msgid "Doctors"
 msgstr ""
@@ -16646,20 +17010,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 ""
 
 #. item "Health/Doctors" text "Name"
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2564
 msgid "Dentist"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2565
 msgid "Edit Dentist"
 msgstr ""
 
 #. item "Health/Dentist" text "Name"
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2569
 msgid "Pharmacy"
 msgstr ""
@@ -16667,5 +17031,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 ""
@@ -16673,10 +17037,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 ""
 
 #. item "Health/Pharmacy" text "Name"
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2576
 msgid "Hospital"
 msgstr ""
@@ -16684,10 +17048,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 ""
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2582
 msgid "Emergency Access Point"
 msgstr ""
@@ -16696,5 +17060,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 ""
@@ -16703,20 +17067,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2588
 msgid "Point Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2589
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2591
 msgid "Phone Number"
 msgstr ""
 
 #. 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 ""
@@ -16724,5 +17088,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 ""
@@ -16731,25 +17095,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 ""
 
 #. group "Places"
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2605
 msgid "Continent"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2606
 msgid "Edit Continent"
 msgstr ""
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2611
 msgid "Country"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2612
 msgid "Edit Country"
 msgstr ""
@@ -16757,30 +17121,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 ""
 
 #. item
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2618
 msgid "Edit State"
 msgstr ""
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2622
+#: build/trans_presets.java:2623
 msgid "Region"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2623
+#: build/trans_presets.java:2624
 msgid "Edit Region"
 msgstr ""
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2628
+#: build/trans_presets.java:2629
 msgid "County"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2629
+#: build/trans_presets.java:2630
 msgid "Edit County"
 msgstr ""
@@ -16788,15 +17152,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2635
+#: build/trans_presets.java:2636
 msgid "City"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2636
+#: build/trans_presets.java:2637
 msgid "Edit City"
 msgstr ""
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2641
+#: build/trans_presets.java:2642
 msgid "Town"
 msgstr ""
@@ -16804,10 +17168,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 ""
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2649
 msgid "Suburb"
 msgstr ""
@@ -16815,25 +17179,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 ""
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2656
 msgid "Village"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2657
 msgid "Edit Village"
 msgstr ""
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2662
 msgid "Hamlet"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2663
 msgid "Edit Hamlet"
 msgstr ""
@@ -16841,5 +17205,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2669
 msgid "Locality"
 msgstr ""
@@ -16847,10 +17211,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 ""
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2676
 msgid "Island"
 msgstr ""
@@ -16858,5 +17222,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 ""
@@ -16864,5 +17228,5 @@
 #. item "Places/Island" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2683
+#: build/trans_presets.java:2684
 msgid "Cave Entrance"
 msgstr ""
@@ -16870,10 +17234,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 ""
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2690
 msgid "Peak"
 msgstr ""
@@ -16881,10 +17245,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 ""
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2697
 msgid "Glacier"
 msgstr ""
@@ -16892,10 +17256,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 ""
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2703
+#: build/trans_presets.java:2704
 msgid "Volcano"
 msgstr ""
@@ -16903,70 +17267,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 ""
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2711
+#: build/trans_presets.java:2712
 msgid "Boundaries"
 msgstr ""
 
 #. group "Boundaries"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2713
 msgid "National"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2714
 msgid "Edit National Boundary"
 msgstr ""
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2718
+#: build/trans_presets.java:2719
 msgid "Administrative"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2720
 msgid "Edit Administrative Boundary"
 msgstr ""
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2724
+#: build/trans_presets.java:2725
 msgid "Civil"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2725
+#: build/trans_presets.java:2726
 msgid "Edit Civil Boundary"
 msgstr ""
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2730
+#: build/trans_presets.java:2731
 msgid "Political"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:2732
 msgid "Edit Political Boundary"
 msgstr ""
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2736
+#: build/trans_presets.java:2737
 msgid "National park"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2737
+#: build/trans_presets.java:2738
 msgid "Edit National Park Boundary"
 msgstr ""
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2744
 msgid "Land use"
 msgstr ""
 
 #. group "Land use"
-#: build/trans_presets.java:2744
+#: build/trans_presets.java:2745
 msgid "Tree"
 msgstr ""
@@ -16975,15 +17339,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 ""
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2753
 msgid "Botanical Name"
 msgstr ""
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2755
 msgid "Wood"
 msgstr ""
@@ -16992,5 +17356,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 ""
@@ -16998,17 +17362,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 ""
 
-#: build/trans_presets.java:2760 build/trans_presets.java:2769
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
 msgid "deciduous"
 msgstr ""
 
-#: build/trans_presets.java:2760 build/trans_presets.java:2769
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
 msgid "mixed"
 msgstr ""
 
-#: build/trans_presets.java:2762
+#: build/trans_presets.java:2763
 msgid "Forest"
 msgstr ""
@@ -17017,14 +17381,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 ""
 
-#: build/trans_presets.java:2771
+#: build/trans_presets.java:2772
 msgid "Nature Reserve"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2773
 msgid "Edit Nature Reserve"
 msgstr ""
@@ -17032,25 +17396,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2777
+#: build/trans_presets.java:2778
 msgid "Scree"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:2779
 msgid "Edit Scree"
 msgstr ""
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2783
 msgid "Scrub"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2783
+#: build/trans_presets.java:2784
 msgid "Edit Scrub"
 msgstr ""
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2788
 msgid "Fell"
 msgstr ""
@@ -17058,10 +17422,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 ""
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2794
 msgid "Heath"
 msgstr ""
@@ -17069,5 +17433,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 ""
@@ -17075,5 +17439,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2801
 msgid "Farmyard"
 msgstr ""
@@ -17082,45 +17446,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 ""
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2808
+#: build/trans_presets.java:2809
 msgid "Farmland"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2810
 msgid "Edit Farmland Landuse"
 msgstr ""
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2814
+#: build/trans_presets.java:2815
 msgid "Meadow"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2816
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2820
+#: build/trans_presets.java:2821
 msgid "Vineyard"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2822
 msgid "Edit Vineyard Landuse"
 msgstr ""
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2826
+#: build/trans_presets.java:2827
 msgid "Allotments"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:2828
 msgid "Edit Allotments Landuse"
 msgstr ""
@@ -17128,25 +17492,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2833
+#: build/trans_presets.java:2834
 msgid "Garden"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2835
 msgid "Edit Garden"
 msgstr ""
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2838
+#: build/trans_presets.java:2839
 msgid "Grass"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2839
+#: build/trans_presets.java:2840
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2845
 msgid "Village Green"
 msgstr ""
@@ -17154,10 +17518,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 ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:2852
 msgid "Common"
 msgstr ""
@@ -17165,20 +17529,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 ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2858
 msgid "Park"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:2859
 msgid "Edit Park"
 msgstr ""
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2863
 msgid "Recreation Ground"
 msgstr ""
@@ -17186,5 +17550,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 ""
@@ -17192,15 +17556,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2871
 msgid "Residential area"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2872
 msgid "Edit Residential Landuse"
 msgstr ""
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2877
 msgid "Graveyard"
 msgstr ""
@@ -17208,9 +17572,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 ""
 
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:2885
 msgid "Cemetery"
 msgstr ""
@@ -17218,39 +17582,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 ""
 
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2894
 msgid "Retail"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2895
 msgid "Edit Retail Landuse"
 msgstr ""
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2900
 msgid "Commercial"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2901
 msgid "Edit Commercial Landuse"
 msgstr ""
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2906
 msgid "Industrial"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2906
+#: build/trans_presets.java:2907
 msgid "Edit Industrial Landuse"
 msgstr ""
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2912
 msgid "Railway land"
 msgstr ""
@@ -17258,15 +17622,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 ""
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:2919
 msgid "Military"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2920
 msgid "Edit Military Landuse"
 msgstr ""
@@ -17274,55 +17638,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2925
+#: build/trans_presets.java:2926
 msgid "Construction area"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2927
 msgid "Edit Construction Landuse"
 msgstr ""
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2932
 msgid "Brownfield"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:2933
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2937
+#: build/trans_presets.java:2938
 msgid "Greenfield"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:2939
 msgid "Edit Greenfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:2944
 msgid "Landfill"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:2945
 msgid "Edit Landfill Landuse"
 msgstr ""
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2950
 msgid "Quarry"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2950
+#: build/trans_presets.java:2951
 msgid "Edit Quarry Landuse"
 msgstr ""
 
 #. group "Relations"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2960
 msgid "Multipolygon"
 msgstr ""
@@ -17332,5 +17696,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 ""
@@ -17339,10 +17703,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:2970
 msgid "outer segment"
 msgstr ""
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:2970
+#: build/trans_presets.java:2971
 msgid "inner segment"
 msgstr ""
@@ -17350,5 +17714,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:2974
 msgid "Turn restriction"
 msgstr ""
@@ -17357,5 +17721,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 ""
@@ -17363,34 +17727,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 ""
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_straight_on"
 msgstr ""
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_u_turn"
 msgstr ""
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "only_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "only_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "only_straight_on"
 msgstr ""
@@ -17399,15 +17763,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2983
+#: build/trans_presets.java:2984
 msgid "from way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2985
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2986
 msgid "to way"
 msgstr ""
@@ -17415,5 +17779,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:2988
+#: build/trans_presets.java:2989
 msgid "Route"
 msgstr ""
@@ -17422,5 +17786,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 ""
@@ -17428,5 +17792,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 ""
@@ -17498,5 +17862,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
@@ -17505,17 +17869,17 @@
 msgstr ""
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "bus"
 msgstr ""
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "ski"
 msgstr ""
@@ -17568,5 +17932,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
@@ -17575,13 +17939,13 @@
 msgstr ""
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "hiking"
 msgstr ""
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "detour"
 msgstr ""
@@ -17595,10 +17959,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 ""
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:2997
 msgid "Symbol description"
 msgstr ""
@@ -17606,26 +17970,26 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:2999
+#: build/trans_presets.java:3000
 msgid "Network"
 msgstr ""
 
 #. item "Relations/Route" combo "State"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3003
 msgid "Color (hex)"
 msgstr ""
@@ -17634,30 +17998,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:3006
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3007
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3008
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3009
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3010
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3011
 msgid "backward halt point"
 msgstr ""
@@ -21775,4 +22139,13 @@
 #~ msgstr "Transmit datele"
 
+#~ msgid "Email"
+#~ msgstr "Email"
+
+#~ msgid "Login name (email) to the OSM account."
+#~ msgstr "Nume autentificare (email) pentru contul OSM."
+
+#~ msgid "OSM username (email)"
+#~ msgstr "Nume utilizator OSM (email)"
+
 #~ msgid "Unknown host"
 #~ msgstr "Gazdă necunoscută"
Index: applications/editors/josm/i18n/po/ru.po
===================================================================
--- applications/editors/josm/i18n/po/ru.po	(revision 16008)
+++ applications/editors/josm/i18n/po/ru.po	(revision 16009)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-14 16:51+0200\n"
-"PO-Revision-Date: 2009-06-12 21:16+0000\n"
-"Last-Translator: kolen <incredible.angst@gmail.com>\n"
+"POT-Creation-Date: 2009-06-19 21:52+0200\n"
+"PO-Revision-Date: 2009-06-16 06:44+0000\n"
+"Last-Translator: Egor Bushmelyov <Unknown>\n"
 "Language-Team: Koptev Oleg <koptev.oleg@gmail.com>\n"
 "MIME-Version: 1.0\n"
@@ -17,5 +17,5 @@
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2009-06-14 14:46+0000\n"
+"X-Launchpad-Export-Date: 2009-06-19 19:35+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: RUSSIAN FEDERATION\n"
@@ -30,11 +30,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 "Справка"
 
 #: ../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 ""
 "Невозможно прочитать вид проекции из настроек. Используется проекция "
@@ -75,6 +75,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
@@ -91,8 +93,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
@@ -141,5 +143,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"
@@ -542,5 +544,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}"
@@ -612,6 +614,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:92
-msgid "Email"
-msgstr "Электронная почта"
+msgid "E-Mail"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:96
@@ -649,12 +651,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
@@ -681,5 +685,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
@@ -712,16 +716,13 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:207
 #, java-format
-msgid "Helppage missing. Create it in <A HREF=\"{0}\">english</A>."
-msgstr ""
-"Страница справки отсутствует. Создайте её в<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 ""
-"Страница справки отсутствует. Создайте её в <A HREF=\"{0}\">english</A> или "
-"<A HREF=\"{1}\">вашем языке</A>."
 
 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:26
@@ -803,5 +804,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:70
 msgid "Mirror"
-msgstr ""
+msgstr "Зеркало"
 
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
@@ -1160,13 +1161,13 @@
 msgstr "Справка: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:99
 msgid "Status Report"
 msgstr "Отчёт о состоянии"
 
-#: ../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 "Скопировать в буфер и закрыть"
 
-#: ../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
@@ -1372,16 +1373,14 @@
 msgstr "Снять выделение со всего (Escape)"
 
-#: ../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 "Обновить данные"
 
-#: ../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 "Обновить слой данных с сервера (скачать данные заново)"
 
-#: ../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?"
@@ -1389,88 +1388,258 @@
 "Не найдено данных для обновления. Вы уже открыли скачанный слой данных?"
 
-#: ../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 ""
-"Это действие потребует {0} персонифицированного запроса на скачивание. Вы "
-"желаете продолжить?"
-
-#: ../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 "Загрузить на OSM..."
 
-#: ../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 "Загрузить все изменения на OSM"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:96
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:94
 msgid "Objects to add:"
 msgstr "Новые объекты:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102
 msgid "Objects to modify:"
 msgstr "Изменённые объекты:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:110
 msgid "Objects to delete:"
 msgstr "Удаляемые объекты:"
 
-#: ../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 "Опишите изменения для закачиваемых данных:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:126
 msgid "Upload these changes?"
 msgstr "Загрузить эти изменения?"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:130
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
 msgid "Upload Changes"
 msgstr "Загрузить изменения"
 
-#: ../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 "Нечего загружать. Сначала создайте данные."
 
-#: ../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 "Присутствуют неразрешённые конфликты. Для начала, разрешите их"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:182
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:180
 msgid "No changes to upload."
 msgstr "Нет изменений для загрузки."
 
-#: ../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 ""
@@ -1575,37 +1744,51 @@
 msgstr "Данные GPS"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:44
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:46
 msgid "Downloading data"
 msgstr "Загрузка данных"
 
-#: ../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 "Данные не импортированы"
 
-#: ../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 "Слой данных {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 "Данные OpenStreetMap"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:37
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:45
 msgid "Data Layer"
 msgstr "Слой данных"
 
-#: ../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 "Скачивание {0} из {1} ({2} осталось)"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:88
-msgid "The following errors occured during mass download:"
-msgstr "Эта ошибка вызвана в течении массовой загрузки:"
-
-#: ../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 "Ошибка в течение загрузки"
+
+#: ../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
@@ -1659,34 +1842,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 "Добавить точку"
 
-#: ../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 "Вставить точку в линию"
 
-#: ../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 "Присоединить линию к точке"
 
-#: ../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 "Добавить точку к линии"
 
-#: ../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 "Добавить точку к линии и объединить"
 
-#: ../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 "Создать новую точку"
 
-#: ../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 "Выбирете точко под курсором"
 
-#: ../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."
@@ -1696,14 +1879,14 @@
 msgstr[2] "Вставить новую точку в {0} линий"
 
-#: ../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 "Начать путь с последней точки"
 
-#: ../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 "Продолжить путь с последней точки"
 
-#: ../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 "Закончено вычерчивание"
@@ -2030,26 +2213,32 @@
 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 "Загрузить выделенное"
 
-#: ../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 "Связаться с {0}..."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:45
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:46
 msgid "Downloading..."
 msgstr "Загрузка..."
 
-#: ../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 "Ошибка соединения с адресом: \"{0}\""
 
-#: ../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 "Ошибка разбора ссылки: \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:74
+msgid "Error while communicating with server."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67
@@ -2111,13 +2300,85 @@
 msgstr "Разрешить {0} конфликтов в {1} объектах"
 
-#: ../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 "Удалить {1} {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97
+#, java-format
+msgid "Delete {0} {1}"
+msgstr "Удалить {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153
+msgid "Conflicting relation"
+msgstr "Конфликтующее отношение"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147
+#, java-format
+msgid ""
+"Selection \"{0}\" is used by relation \"{1}\" with role {2}.\n"
+"Delete from relation?"
+msgstr ""
+"Выделенный объект \"{0}\" используется отношением \"{1}\" в роли \"{2}\".\n"
+"Удалить из отношения?"
+
+#: ../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 ""
+"Выделенный объект \"{0}\" используется отношением \"{1}\".\n"
+"Удалить из отношения?"
+
+#: ../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 ""
+"Вы собираетесь удалить точки, выходящие за скачанную зону.<br>Это может "
+"вызвать проблемы, потому что другие объекты (которых не видно) могут "
+"использовать их.<br> Вы действительно хотите удалить их?"
+
+#: ../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 "Переместить"
+
 #: ../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"
@@ -2127,10 +2388,219 @@
 msgstr[2] "узлов"
 
-#: ../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 "Последовательность"
+
+#: ../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 "Ошибка в файле конфигурации на строках {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:324
+#, java-format
+msgid "Cannot open preferences directory: {0}"
+msgstr "Не удается прочитать каталог с настройками: {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 "Файл настроек поврежден. Восстанавливаем из старой копии в {0}."
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:79
+#, java-format
+msgid "Preferences stored on {0}"
+msgstr "Параметры сохранены на {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:82
+#, java-format
+msgid "Could not upload preferences. Reason: {0}"
+msgstr "Невозможно загрузить параметры. Причина: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:93
+msgid "Could not load preferences from server."
+msgstr "Невозможно скачать параметры с сервера."
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:34
+msgid "different"
+msgstr "различный"
+
+#: ../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 "Ошибка: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
+#, java-format
+msgid "Warning: {0}"
+msgstr "Предупреждение: {0}"
+
+#: ../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"
@@ -2140,8 +2610,10 @@
 msgstr[2] "линий"
 
-#: ../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
@@ -2153,265 +2625,27 @@
 msgstr[2] "отношений"
 
-#: ../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 "Удалить {1} {0}"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97
-#, java-format
-msgid "Delete {0} {1}"
-msgstr "Удалить {0} {1}"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153
-msgid "Conflicting relation"
-msgstr "Конфликтующее отношение"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147
-#, java-format
-msgid ""
-"Selection \"{0}\" is used by relation \"{1}\" with role {2}.\n"
-"Delete from relation?"
-msgstr ""
-"Выделенный объект \"{0}\" используется отношением \"{1}\" в роли \"{2}\".\n"
-"Удалить из отношения?"
-
-#: ../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 ""
-"Выделенный объект \"{0}\" используется отношением \"{1}\".\n"
-"Удалить из отношения?"
-
-#: ../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 ""
-"Вы собираетесь удалить точки, выходящие за скачанную зону.<br>Это может "
-"вызвать проблемы, потому что другие объекты (которых не видно) могут "
-"использовать их.<br> Вы действительно хотите удалить их?"
-
-#: ../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 "Переместить"
-
-#: ../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 "Последовательность"
-
-#: ../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 "Ошибка в файле конфигурации на строках {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:324
-#, java-format
-msgid "Cannot open preferences directory: {0}"
-msgstr "Не удается прочитать каталог с настройками: {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 "Файл настроек поврежден. Восстанавливаем из старой копии в {0}."
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:79
-#, java-format
-msgid "Preferences stored on {0}"
-msgstr "Параметры сохранены на {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:82
-#, java-format
-msgid "Could not upload preferences. Reason: {0}"
-msgstr "Невозможно загрузить параметры. Причина: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:93
-msgid "Could not load preferences from server."
-msgstr "Невозможно скачать параметры с сервера."
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:34
-msgid "different"
-msgstr "различный"
-
-#: ../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 "Ошибка: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
-#, java-format
-msgid "Warning: {0}"
-msgstr "Предупреждение: {0}"
-
-#: ../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"
@@ -2426,5 +2660,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:122
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "railway"
 msgstr "железная дорога"
@@ -2447,4 +2681,62 @@
 msgstr[2] "{0} точек"
 
+#: ../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."
@@ -2592,5 +2884,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 "фон"
@@ -2679,8 +2971,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
@@ -2692,7 +2984,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
@@ -2800,10 +3092,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 "Имя пользователя"
 
 #: ../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 "Пароль"
@@ -2901,22 +3193,22 @@
 "используется."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:146
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148
 msgid "File"
 msgstr "Файл"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150
 msgid "View"
 msgstr "Вид"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:149
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151
 msgid "Tools"
 msgstr "Инструменты"
 
-#: ../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 "Шаблоны"
 
-#: ../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
@@ -2929,21 +3221,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 "Каркас"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:218
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221
 msgid "Toggle Wireframe view"
 msgstr "Показать/скрыть каркас"
 
-#: ../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 "Аудио"
@@ -3015,6 +3307,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 "слоя нет в списке."
@@ -3024,9 +3316,9 @@
 msgstr "Соединение с OSM сервером..."
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:104
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:105
 msgid "Error while parsing"
 msgstr "Ошибка разбора"
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:107
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:108
 msgid "File not found"
 msgstr "Файл не найден"
@@ -3098,5 +3390,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 "Участники"
@@ -3292,5 +3584,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
@@ -3372,5 +3664,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 ""
@@ -3409,5 +3701,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 ""
 
@@ -3461,5 +3753,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 "Роль"
@@ -3563,5 +3855,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
@@ -3873,5 +4165,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 "Отношения"
@@ -3980,66 +4272,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 "Основной"
 
-#: ../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 "Объект"
 
-#: ../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 "Тэги (пустое значение удаляет тэг)"
 
-#: ../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 "Переместить выбранных членов отношения вверх"
 
-#: ../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 "Добавить выбранное"
 
-#: ../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 "Сделать все выбранные объекты участниками отношения"
 
-#: ../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 "Удалить выбранные"
 
-#: ../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 "Удалить все выделенные объекты из связей"
 
-#: ../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 "Переместить выбранных членов отношения вниз"
 
-#: ../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 "Удалить текущего участника из отношения"
 
-#: ../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 "Скачать участников"
 
-#: ../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 "Скачать недостающие части линий и узлов, участвующих в отношении"
@@ -4084,5 +4376,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
@@ -4103,9 +4395,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
@@ -4127,31 +4419,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 "Участники: {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 "Редактор отношений: {0}"
 
-#: ../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 "При импортировании возникли конфликтные ситуации."
 
-#: ../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 "Ошибка при разборе ответа от сервера."
 
-#: ../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 "Невозможно связаться с сервером."
+
+#: ../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
@@ -4217,13 +4512,13 @@
 msgstr "Источники и типы данных"
 
-#: ../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 "Скачать как новый слой"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:174
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:173
 msgid "Download Area"
 msgstr "Область для скачивания"
 
-#: ../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 ""
@@ -4231,5 +4526,5 @@
 "запрос."
 
-#: ../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 "Область для скачивания приемлема по площади."
@@ -4257,5 +4552,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 "Места"
@@ -4302,21 +4597,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 "тип"
@@ -4356,14 +4651,4 @@
 msgid "Tile Numbers"
 msgstr "Номера квадратов"
-
-#: ../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 "Используйте мышь, или Ctrl+стрелки/./ для изменения масштаба."
-
-#. 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 "Карта"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:98
@@ -4443,5 +4728,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)"
@@ -4557,14 +4842,14 @@
 msgstr "Аудиофайлы Wave (*.wav)"
 
-#: ../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 "Аудиомаркеры из {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244
 msgid "Import images"
 msgstr "Импорт изображений"
 
-#: ../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, "
@@ -4574,5 +4859,5 @@
 msgstr[2] "{0} дорожек, "
 
-#: ../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, "
@@ -4582,5 +4867,5 @@
 msgstr[2] "{0} маршрутов, "
 
-#: ../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"
@@ -4590,28 +4875,28 @@
 msgstr[2] "{0} путевых точек"
 
-#: ../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 "Название: {0}"
 
-#: ../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 "Описание: {0}"
 
-#: ../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 "Преобразовать в слой данных"
 
-#: ../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 ""
@@ -4622,11 +4907,11 @@
 "<br>Если хотите загрузить трэк, сделайте это по ссылке:"
 
-#: ../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
@@ -4636,29 +4921,29 @@
 msgstr "Преобразовано из: {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 "Скачать с JSM данные вдоль трэка"
 
-#: ../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 "{0} метров"
 
-#: ../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 "{0} кв. км."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:822
 #, java-format
 msgid ""
@@ -4669,9 +4954,9 @@
 "Продолжить?</html>"
 
-#: ../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 "На слое отсутствует трек GPX, чтобы наложить звук."
 
-#: ../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 "
@@ -4681,5 +4966,5 @@
 "будут пропущены или перенесены в начало трека."
 
-#: ../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 "
@@ -4689,33 +4974,42 @@
 "их время, были проигнорированы."
 
-#: ../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 "версия {0}"
 
-#: ../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 "{0} состоит из:"
 
-#: ../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} удалено)"
 
-#: ../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 "Версия API: {0}"
 
-#: ../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"
@@ -4723,21 +5017,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"
@@ -4893,5 +5187,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
@@ -4900,5 +5194,5 @@
 msgstr "Пожалуйста, выберите ряд для редактирования."
 
-#: ../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
@@ -4906,5 +5200,5 @@
 msgstr "Новое значение для {0}"
 
-#: ../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
@@ -4914,5 +5208,5 @@
 msgstr "Пожалуйста, выберите ряд для удаления."
 
-#: ../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 "Введите новый ключ и значение"
@@ -5806,106 +6100,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 "Название"
@@ -6386,6 +6680,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:36
-msgid "Login name (email) to the OSM account."
-msgstr "Имя пользователя (e-mail) учётной записи OSM"
+msgid "Login name (e-mail) to the OSM account."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
@@ -6399,6 +6693,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
-msgid "OSM username (email)"
-msgstr "Имя пользователя OSM (e-mail)"
+msgid "OSM username (e-mail)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
@@ -6409,10 +6703,7 @@
 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 ""
-"<html>Внимание! Пароль хранится в открытом виде в файле настроек.<br> Пароль "
-"передаётся по сети в открытом виде, как параметр запроса.<br><b>Не "
-"используйте ценный пароль.</b></html>"
 
 #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on
@@ -6729,6 +7020,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 "Подключение к серверу OSM..."
@@ -6739,7 +7031,7 @@
 msgstr "Загрузка точек с {0} до {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 "Скачивание данных OSM..."
@@ -6804,15 +7096,14 @@
 msgstr "Сбой при импорте NMEA!"
 
-#: ../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 "Эта версия JOSM несовместима с настроенным сервером."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:207
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172
 #, java-format
 msgid ""
@@ -6823,31 +7114,37 @@
 "поддержке {0} до {1}."
 
-#: ../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 "Соединение с {0} установлено используя протокол {1}"
 
-#: ../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 "Открывается список правок..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:351
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298
 msgid "Closing changeset..."
 msgstr "Закрывается список правок..."
 
-#: ../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 "Подготовка..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:381
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:326
 msgid "Uploading..."
 msgstr "Закачка..."
@@ -6862,25 +7159,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 "Неправильный пароль или имя пользователя."
 
-#: ../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 "Внимание: Пароль будет передан в незашифрованном виде."
 
-#: ../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 "Сохранить имя пользователя и пароль (не зашифровано)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:89
 msgid "Enter Password"
 msgstr "Введите пароль"
 
-#: ../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..."
@@ -6891,4 +7188,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."
@@ -6983,9 +7323,23 @@
 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 "Соединение с сервером..."
 
-#: ../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."
@@ -6994,17 +7348,9 @@
 "соединение."
 
-#: ../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 ""
-"Сервер сообщил о внутренней ошибке. Попробуйте уменьшить область, или "
-"повторите попытку позже."
-
-#: ../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 ""
 
@@ -7020,5 +7366,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 "Скачать модули"
@@ -7208,9 +7554,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 "Скачивание недостающих модулей"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:128
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:119
 #, java-format
 msgid ""
@@ -7223,6 +7569,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
@@ -7245,35 +7591,35 @@
 msgstr "неизвестный"
 
-#: ../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}: Версия {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 "Модуль из поставки JOSM"
 
-#: ../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 "Ошибка чтения файла с описанием модуля: {0}"
 
-#: ../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 "Это позже конца записи"
 
-#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:329
+#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:340
 msgid "Error playing sound"
 msgstr "Ошибка при воспроизведении звука"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
 msgid "Do nothing"
 msgstr "Ничего не делать"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
 msgid "Report Bug"
 msgstr "Сообщить об ошибке"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:52
 msgid ""
 "An unexpected exception occurred.\n"
@@ -7287,14 +7633,14 @@
 "последней версией JOSM, будьте добры, отправьте отчёт об ошибке."
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55
 msgid "Unexpected Exception"
 msgstr "Неожиданная ошибка"
 
-#: ../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 "Пожалуйста, создайте отчёт об ошибке по адресу {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 ""
@@ -7302,5 +7648,5 @@
 "подробнее!)"
 
-#: ../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 "
@@ -7310,9 +7656,9 @@
 "ошибке."
 
-#: ../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 "Прикрепите следующую информацию к отчёту:"
 
-#: ../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 "(Текст уже скопирован в буфер обмена)"
@@ -7398,5 +7744,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 "Описание"
@@ -7778,9 +8124,7 @@
 #: ../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 ""
-"Произошла ошибка при попытке сопоставить фотографии с GPX треком. Вы можете "
-"настроить вручную с помощью ползунов соответствие фотографиям."
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:853
@@ -7812,5 +8156,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"
@@ -7833,5 +8176,5 @@
 msgstr "Lambert зона 4 кэш файл (.4)"
 
-#: ../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
@@ -7926,6 +8269,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/"
@@ -8012,6 +8355,6 @@
 msgstr "Добавить \"source=...\" к элементам?"
 
-#: ../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
@@ -8019,11 +8362,11 @@
 msgstr "Загружается {0}"
 
-#: ../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 "Соединение с WMS Server..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:157
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:158
 msgid "Create buildings"
 msgstr "Создание зданий"
@@ -8042,13 +8385,13 @@
 msgstr "Пожалуйста, включите Авто-источники и проверте millesime кадастр."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:61
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:62
 msgid "Extract SVG ViewBox..."
 msgstr "Экспортировать окно просмотра SVG"
 
-#: ../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 "Создать границы"
@@ -8069,5 +8412,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 "Загрузить изображение с французского Cadastre WMS"
 
@@ -8166,5 +8509,5 @@
 "Выберите сначала один из них, а затем повторите"
 
-#: ../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
@@ -8172,60 +8515,28 @@
 msgstr "Пустой слой"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:176
 #, java-format
 msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr "слой WMS  ({0}), {1} фрагмент(ы) загружен(ы)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:183
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:178
 msgid "Is not vectorized."
 msgstr "Не векторизованны."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:179
 #, java-format
 msgid "Raster center: {0}"
 msgstr "Центр растра: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181
 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 "общий квадрат: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:282
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
-msgid "Save WMS layer to file"
-msgstr "Сохранить слой WMS в файл"
-
-#: ../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 "Загрузить слой WMS из файла"
-
-#: ../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 ""
-"Не поддерживаемый формат версии WMS файла; обнаружено {0}, ожидалось {1}"
-
-#: ../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 ""
@@ -8236,14 +8547,14 @@
 "Создайте новый файл."
 
-#: ../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 "Зона Ламберта {0} в кеше несовместима с текущей зоной Ламберта {1}"
-
-#: ../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 "Ошибка кеширования зоны Ламберта"
@@ -8338,11 +8649,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 "Импортировать путь из слоя данных GPX"
 
 #: ../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 "Очистить существующий путь"
@@ -8352,5 +8663,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 "Не найдено слоя данных GPX"
@@ -8641,4 +8952,8 @@
 msgid "Lakewalker trace"
 msgstr "Трассировщик озёр"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:10
+msgid "An unknown error has occurred"
+msgstr ""
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
@@ -8963,42 +9278,42 @@
 msgstr "LiveGPS"
 
-#: ../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 "Слой для проведения измерений"
@@ -9059,6 +9374,6 @@
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
-msgid "Open the OpenStreetBugs window and activate the automatic download"
-msgstr "Открыть окно OpenStreetBugs, и включить автоматическое скачивание"
+msgid "Opens the OpenStreetBugs window and activates the automatic download"
+msgstr ""
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:123
@@ -9136,5 +9451,5 @@
 msgstr "Osmarender"
 
-#: ../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 "
@@ -9144,9 +9459,9 @@
 "Настройки карты в окне настроек."
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:123
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:127
 msgid "osmarender options"
 msgstr "Настройки osm рендера"
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:124
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:128
 msgid "Firefox executable"
 msgstr "исполняемый файл Firefox"
@@ -9585,5 +9900,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 "Название улицы"
@@ -9680,6 +9995,6 @@
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:195
-msgid "No intersections found. Nothing was changed."
-msgstr "Пересечения найдено. Ничего не изменялось."
+msgid "No intersection found. Nothing was changed."
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:217
@@ -10572,42 +10887,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 ""
-"Вы можете добавлять, редактировать и удалять записи WMS на закладке  "
-"WMSplugin в установках - тогда они будут отображаться в меню WMS.\n"
-"\n"
-"Вы также можете сделать это вручную в Расширенных настройках, используя "
-"следующую схему:\n"
-"wmsplugin.url.1.name=Landsat\n"
-"wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n"
-"wmsplugin.url.2.name=NPE Maps... etc\n"
-"\n"
-"Пример полного формата  WMS URL (Landsat)\n"
-"http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n"
-"layers=global_mosaic&styles=&srs=EPSG:4326&\n"
-"format=image/jpeg \n"
-"\n"
-"Для карты Metacarta  Rectifier http://labs.metacarta.com/rectifier/, вам "
-"нужно всего лишь ввести соответствующие \"ID\".\n"
-"Чтобы добавить карту Metacarta Rectifier нужно в меню вручную создать URL, "
-"как в этом примере, вместо 73 с 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"
-"Примечание: Убедитесь, что изображение согласовано с координатам, если есть "
-"сомнения в лицензионных правах на изображение, то не используйте его."
-
-#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:54
+
+#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:53
 msgid "WMS Plugin Help"
 msgstr "Справка по модулю WMS"
@@ -10666,5 +10957,5 @@
 msgstr "Отрегулируйте положение выбранного слоя WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113
 #, java-format
 msgid ""
@@ -10711,4 +11002,30 @@
 msgid "Alpha channel"
 msgstr "Альфа канал"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
+msgid "Save WMS layer to file"
+msgstr "Сохранить слой WMS в файл"
+
+#: ../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 "Загрузить слой WMS из файла"
+
+#: ../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 ""
+"Не поддерживаемый формат версии WMS файла; обнаружено {0}, ожидалось {1}"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:335
+msgid "File Format Error"
+msgstr "Ошибка формата файла"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:163
@@ -10803,4 +11120,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 "Вы должны cделать изменения публичными, чтобы выгрузить новые данные"
@@ -10817,5 +11139,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 "Особый обработчик на WMS-сервере французского земельного кадастра."
 
@@ -11138,5 +11460,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 "Сноска"
@@ -11638,5 +11960,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 "Ширина (метры)"
@@ -11772,5 +12094,5 @@
 #: build/trans_presets.java:261
 msgid "alley"
-msgstr "Аллея"
+msgstr "Внутридворовый проезд, переулок"
 
 #: build/trans_presets.java:261
@@ -12105,7 +12427,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 "Тип"
@@ -12721,10 +13043,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 "Оператор"
@@ -12936,7 +13258,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 "Возвышение"
@@ -13868,5 +14190,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 "Денежный сбор"
@@ -14002,5 +14324,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 "Справка (номер платформы)"
@@ -14008,5 +14330,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 "Область"
@@ -14058,11 +14380,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 "Править автобусную платформу"
@@ -14070,5 +14402,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1512
+#: build/trans_presets.java:1513
 msgid "Taxi"
 msgstr "Такси"
@@ -14076,5 +14408,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 "Править стоянку такси"
@@ -14082,5 +14414,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1519
+#: build/trans_presets.java:1520
 msgid "Airport"
 msgstr "Аэропорт"
@@ -14088,15 +14420,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 "Международная организация гражданской авиации"
@@ -14105,5 +14437,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1532
+#: build/trans_presets.java:1533
 msgid "Accomodation"
 msgstr "Проживание"
@@ -14115,5 +14447,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 "Гостиница"
@@ -14122,15 +14454,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 "Мотель"
@@ -14138,20 +14470,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 "Дача/Коттедж"
@@ -14159,10 +14491,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 "Студенческое общежитие"
@@ -14170,30 +14502,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 "Кэмпинг"
@@ -14201,10 +14533,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 "Питание"
@@ -14215,5 +14547,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 "Ресторан"
@@ -14221,5 +14553,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 "Править ресторан"
@@ -14227,5 +14559,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 "Кухня"
@@ -14233,61 +14565,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 "Фастфуд"
@@ -14295,9 +14627,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 "Кафе"
@@ -14305,10 +14637,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 "Бар"
@@ -14316,20 +14648,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 "Закусочная"
@@ -14337,10 +14669,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 "Ночной клуб"
@@ -14348,20 +14680,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 "Править достопримечательность"
@@ -14370,11 +14702,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 "Музей"
@@ -14382,10 +14714,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 "Зоопарк"
@@ -14394,10 +14726,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 "Смотровая площадка"
@@ -14405,25 +14737,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 "Рисунки"
@@ -14431,5 +14763,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 "Редактировать рисунки"
@@ -14437,5 +14769,5 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1667
 msgid "Information Office"
 msgstr "Справочное бюро"
@@ -14443,83 +14775,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 "Карта"
+
 #. 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 "Править навес"
@@ -14527,25 +14856,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 "Замок"
@@ -14554,20 +14883,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 "Место раскопок"
@@ -14576,10 +14905,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 "Поле битвы"
@@ -14587,5 +14916,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 "Править поле битвы"
@@ -14593,15 +14922,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 "Мемориал"
@@ -14609,45 +14938,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 "Игровая площадка"
@@ -14655,15 +14984,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 "Править рыбалку"
@@ -14671,15 +15000,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 "Править стадион"
@@ -14693,6 +15022,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 "вид спорта:"
@@ -15068,6 +15397,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
@@ -15100,227 +15429,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 "Править несколько видов спорта"
@@ -15359,191 +15688,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 "10штырьковый"
 
 #. item
-#: build/trans_presets.java:1839
+#: build/trans_presets.java:1840
 msgid "Edit 10pin"
 msgstr "Редактировать 10 пин"
 
-#: 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 "Лыжный спорт"
@@ -15551,56 +15880,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 "Сложность"
 
 #. 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 "лёгкий"
 
-#: 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 "эксперт"
 
-#: 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 "Стрельба"
@@ -15608,178 +15937,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 "Бейсбол"
 
 #. item
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:1960
 msgid "Edit Baseball"
 msgstr "Править бейсбол"
 
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:1965
 msgid "Basketball"
 msgstr "Баскетбол"
 
 #. item
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:1966
 msgid "Edit Basketball"
 msgstr "Править баскетбол"
 
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:1971
 msgid "Golf"
 msgstr "Гольф"
 
 #. 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 "Крикет"
 
 #. item
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:1990
 msgid "Edit Cricket"
 msgstr "Редактировать Крикет"
 
-#: 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 "Регби"
 
 #. item
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2026
 msgid "Edit Rugby"
 msgstr "Править рэгби"
 
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:2031
 msgid "Table Tennis"
 msgstr "Настольный теннис"
 
 #. item
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2032
 msgid "Edit Table Tennis"
 msgstr "Править настольный теннис"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2037
 msgid "Tennis"
 msgstr "Теннис"
 
 #. item
-#: build/trans_presets.java:2037
+#: build/trans_presets.java:2038
 msgid "Edit Tennis"
 msgstr "Править теннис"
 
 #. <separator/>
-#: build/trans_presets.java:2044
+#: build/trans_presets.java:2045
 msgid "Buildings"
 msgstr "Здания"
 
 #. group "Buildings"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2046
 msgid "Building"
 msgstr "Здание"
@@ -15787,5 +16116,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2049
 msgid "Public Building"
 msgstr "Общественное здание"
@@ -15793,10 +16122,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 "Муниципалитет"
@@ -15804,10 +16133,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 "Править здание муниципалитета"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2061
 msgid "Embassy"
 msgstr "Посольство"
@@ -15815,10 +16144,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 "Править посольство"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2066
+#: build/trans_presets.java:2067
 msgid "Courthouse"
 msgstr "Здание суда"
@@ -15827,10 +16156,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 "Править здание суда"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2074
 msgid "Prison"
 msgstr "Тюрьма"
@@ -15839,10 +16168,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 "Править тюрьму"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2080
+#: build/trans_presets.java:2081
 msgid "Police"
 msgstr "Полиция/Милиция"
@@ -15852,10 +16181,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 "Править полицию"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2089
 msgid "Fire Station"
 msgstr "Пожарное депо"
@@ -15864,10 +16193,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 "Править пожарное депо"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2096
 msgid "Post Office"
 msgstr "Почтовое отделение"
@@ -15875,5 +16204,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 "Править почтовое отделение"
@@ -15881,15 +16210,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2103
 msgid "Kindergarten"
 msgstr "Детский сад"
 
 #. item
-#: build/trans_presets.java:2103
+#: build/trans_presets.java:2104
 msgid "Edit Kindergarten"
 msgstr "Править детсад"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2108
 msgid "School"
 msgstr "Школа"
@@ -15897,10 +16226,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 "Править школу"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2114
 msgid "University"
 msgstr "Университет"
@@ -15908,10 +16237,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 "Править университет"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2120
 msgid "College"
 msgstr "Колледж"
@@ -15919,5 +16248,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 "Править колледж"
@@ -15925,5 +16254,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2126
+#: build/trans_presets.java:2127
 msgid "Cinema"
 msgstr "Кинотеатр"
@@ -15932,10 +16261,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 "Править кинотеатр"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2133
+#: build/trans_presets.java:2134
 msgid "Library"
 msgstr "Библиотека"
@@ -15944,10 +16273,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 "Править библиотеку"
 
 #. item "Buildings/Library" text "Name"
-#: build/trans_presets.java:2140
+#: build/trans_presets.java:2141
 msgid "Arts Centre"
 msgstr "Центр искусств"
@@ -15955,10 +16284,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 "Театр"
@@ -15967,10 +16296,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 "Править театр"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2154
 msgid "Place of Worship"
 msgstr "Место поклонения"
@@ -15980,5 +16309,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 "Править место поклонения"
@@ -15987,6 +16316,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 "Религия"
@@ -15995,66 +16324,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 "Буддизм"
 
-#: 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 "Христианство"
 
-#: 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 "Индуизм"
 
-#: 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 "Иудаизм"
 
-#: 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 "Мусульманство"
 
-#: 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 "сикхизм"
 
-#: 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 "Спиритуализм"
 
-#: 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 "Даосизм"
 
-#: 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 "зороастризм"
 
-#: 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 "Конфессия"
@@ -16063,81 +16392,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 "Англиканская"
 
-#: 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 "Баптизм"
 
-#: 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 "Католическая"
 
-#: 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 "Евангельская"
 
-#: 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 "Свидетели Иеговы"
 
-#: 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 "Лютеранство"
 
-#: 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 "Методизм"
 
-#: 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 "Мормон"
 
-#: 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 "Православие"
 
-#: 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 "пятидесятник"
 
-#: 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 "пресвитерианин"
 
-#: 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 "Протестантизм"
 
-#: 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 "квакер"
 
-#: 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 "Адреса"
@@ -16146,5 +16475,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 "Править адреса"
@@ -16152,5 +16481,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2169
+#: build/trans_presets.java:2170
 msgid "House number"
 msgstr "Номер дома"
@@ -16158,20 +16487,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2172
 msgid "House name"
 msgstr "Название дома"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2174
 msgid "City name"
 msgstr "Название города"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2174
+#: build/trans_presets.java:2175
 msgid "Post code"
 msgstr "Почтовый индекс"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2176
 msgid "Country code"
 msgstr "Код страны"
@@ -16179,5 +16508,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2179
 msgid "Address Interpolation"
 msgstr "Интерполяция адресов"
@@ -16186,5 +16515,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 "Править интерполяцию адресов"
@@ -16192,71 +16521,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 "нечётные"
 
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2184
 msgid "even"
 msgstr "чётные"
 
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2184
 msgid "all"
 msgstr "все"
 
-#: 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 "Рукотворное"
 
 #. group "Man Made"
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2188
 msgid "Works"
 msgstr "Цеха"
 
 #. item
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2189
 msgid "Edit Works"
 msgstr "Править цеха"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2193
 msgid "Tower"
 msgstr "Башня"
 
 #. item
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2194
 msgid "Edit Tower"
 msgstr "Править башню"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2198
 msgid "Water Tower"
 msgstr "Водонапорная башня"
 
 #. item
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2199
 msgid "Edit Water Tower"
 msgstr "Править водонапорную башню"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2203
 msgid "Gasometer"
 msgstr "Газгольдер"
 
 #. item
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2204
 msgid "Edit Gasometer"
 msgstr "Править газгольдер"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2207
+#: build/trans_presets.java:2208
 msgid "Lighthouse"
 msgstr "Маяк"
@@ -16264,10 +16593,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 "Править маяк"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2214
 msgid "Windmill"
 msgstr "Ветряная мельница"
@@ -16275,10 +16604,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 "Править ветряную мельницу"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2220
 msgid "Pipeline"
 msgstr "Трубопровод"
@@ -16286,10 +16615,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 "Править трубопровод"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2225
+#: build/trans_presets.java:2226
 msgid "Wastewater Plant"
 msgstr "Очистные сооружения"
@@ -16299,10 +16628,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 "Кран"
@@ -16310,10 +16639,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 "Править кран"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2239
+#: build/trans_presets.java:2240
 msgid "Beacon"
 msgstr "Буй"
@@ -16321,10 +16650,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 "Править буй"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2245
+#: build/trans_presets.java:2246
 msgid "Survey Point"
 msgstr "Точка наблюдений"
@@ -16332,10 +16661,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 "Править точку наблюдений"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2252
 msgid "Surveillance"
 msgstr "Видеонаблюдение"
@@ -16343,5 +16672,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 "Править видеонаблюдение"
@@ -16349,5 +16678,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2258
+#: build/trans_presets.java:2259
 msgid "Power Generator"
 msgstr "Электростанция"
@@ -16357,39 +16686,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 "Править электростанцию"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "wind"
 msgstr "энергия ветра"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "hydro"
 msgstr "энергия воды"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "fossil"
 msgstr "энергия сгорания топлива"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "nuclear"
 msgstr "атомный"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "coal"
 msgstr "уголь"
 
-#: 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 "газ"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2268
 msgid "Power Station"
 msgstr "Электроподстанция"
@@ -16398,10 +16727,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 "Править электроподстанцию"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2274
+#: build/trans_presets.java:2275
 msgid "Power Sub Station"
 msgstr "Трансформаторная будка"
@@ -16410,5 +16739,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 "Править трансформатор"
@@ -16416,10 +16745,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 "Опора ЛЭП"
@@ -16430,5 +16759,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 "Править опору ЛЭП"
@@ -16436,5 +16765,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 "Линия электропередач"
@@ -16443,25 +16772,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 "Напряжение"
 
 #. 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 "Туалеты"
@@ -16469,20 +16798,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 "Примечание"
 
 #. 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 "Телефон"
@@ -16491,5 +16820,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 "Править телефон"
@@ -16497,5 +16826,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 "Монеты"
@@ -16503,5 +16832,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 "Банкноты"
@@ -16509,5 +16838,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 "Электронные средства оплаты"
@@ -16515,5 +16844,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 "Дебитные карты"
@@ -16521,15 +16850,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 "Кредитные карты"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2328
 msgid "Telephone cards"
 msgstr "Телефонные карты"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2330
 msgid "Recycling"
 msgstr "Переработка отходов"
@@ -16538,5 +16867,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 "Править переработку отходов"
@@ -16544,35 +16873,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 "Батарейки"
 
 #. 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 "Одежда"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2338
 msgid "Glass"
 msgstr "Стекло"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2339
 msgid "Paper"
 msgstr "Бумага"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2340
 msgid "Scrap Metal"
 msgstr "Металлолом"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2342
 msgid "Bench"
 msgstr "Скамейка"
@@ -16581,20 +16910,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 "Охотничий стенд"
 
 #. item
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2347
 msgid "Edit Hunting Stand"
 msgstr "Править охотничий стенд"
 
 #. item "Amenities/Hunting Stand" check "Shelter"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2350
 msgid "Hide"
 msgstr "Укрытие"
 
 #. item "Amenities/Hunting Stand" check "Hide"
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2351
 msgid "Lock"
 msgstr "Заблокирован"
@@ -16602,22 +16931,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 "Высота"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2351
+#: build/trans_presets.java:2352
 msgid "low"
 msgstr "низкий"
 
-#: build/trans_presets.java:2351
+#: build/trans_presets.java:2352
 msgid "half"
 msgstr "средний"
 
-#: build/trans_presets.java:2351
+#: build/trans_presets.java:2352
 msgid "full"
 msgstr "полный"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2354
 msgid "Fountain"
 msgstr "Фонтан"
@@ -16626,10 +16955,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 "Править фонтан"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2361
 msgid "Drinking Water"
 msgstr "Питьевая вода"
@@ -16638,10 +16967,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 "Править источник воды"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2367
+#: build/trans_presets.java:2368
 msgid "Baby Hatch"
 msgstr "Детская комната"
@@ -16649,25 +16978,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 "Магазины"
 
 #. group "Shops"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2377
 msgid "Supermarket"
 msgstr "Супермаркет"
 
 #. item
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2378
 msgid "Edit Supermarket"
 msgstr "Править супермаркет"
 
 #. item "Shops/Supermarket" text "Name"
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:2382
 msgid "Convenience Store"
 msgstr "Продуктовый магазин"
@@ -16675,10 +17004,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 "Киоск"
@@ -16686,10 +17015,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 "Править киоск"
 
 #. item "Shops/Kiosk" text "Name"
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2394
 msgid "Vending machine"
 msgstr "Торговый автомат"
@@ -16697,5 +17026,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 "Править торговый автомат"
@@ -16703,88 +17032,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 "билеты на общественный транспорт"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "public_transport_plans"
 msgstr "план общественного транспорта"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "parking_tickets"
 msgstr "билеты на парковку"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "food"
 msgstr "еда"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "drinks"
 msgstr "напитки"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "sweets"
 msgstr "сладости"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "cigarettes"
 msgstr "сигареты"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "photos"
 msgstr "фотографии"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "animal_food"
 msgstr "еда для животных"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "news_papers"
 msgstr "газеты"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "toys"
 msgstr "игрушки"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "stamps"
 msgstr "марки"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "SIM-cards"
 msgstr "SIM-карты"
 
-#: 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 "презервативы"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "tampons"
 msgstr "тампоны"
 
-#: 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 "Мясная лавка"
@@ -16792,10 +17121,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 "Править мясную лавку"
 
 #. item "Shops/Butcher" text "Name"
-#: build/trans_presets.java:2414
+#: build/trans_presets.java:2415
 msgid "Baker"
 msgstr "Булочная"
@@ -16803,10 +17132,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 "Править булочную"
 
 #. item "Shops/Baker" text "Name"
-#: build/trans_presets.java:2420
+#: build/trans_presets.java:2421
 msgid "Florist"
 msgstr "Флорист"
@@ -16814,20 +17143,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 "Редактировать флориста"
 
 #. 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 "Алкоголь"
@@ -16835,60 +17164,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 "Напитки"
 
 #. 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 "Компьютер"
 
 #. item
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2444
 msgid "Edit Computer Shop"
 msgstr "Редактировать магазин компьютеров"
 
 #. item "Shops/Computer" text "Name"
-#: build/trans_presets.java:2447
+#: build/trans_presets.java:2448
 msgid "Electronics"
 msgstr "Электроника"
 
 #. item
-#: build/trans_presets.java:2448
+#: build/trans_presets.java:2449
 msgid "Edit Electronics Shop"
 msgstr "Редактиновать Магазан электрнонной техники"
 
 #. 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 "Мебельный"
 
 #. item
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2459
 msgid "Edit Furniture Shop"
 msgstr "Править мебельный магазин"
 
 #. item "Shops/Furniture" text "Name"
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2463
 msgid "Garden Centre"
 msgstr "Садовый магазин"
@@ -16896,10 +17225,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 "Редактировать Садовый магазин"
 
 #. item "Shops/Garden Centre" text "Name"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2469
 msgid "Hardware"
 msgstr "Оборудование"
@@ -16907,10 +17236,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 "Редактировать Магазин оборудования"
 
 #. item "Shops/Hardware" text "Name"
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2475
 msgid "Do-it-yourself-store"
 msgstr "Строительный магазин"
@@ -16918,60 +17247,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 "Канцтовары"
 
 #. item
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2482
 msgid "Edit Stationery Shop"
 msgstr "Редактировать Магазин Канцтоваров"
 
 #. item "Shops/Stationery" text "Name"
-#: build/trans_presets.java:2485
+#: build/trans_presets.java:2486
 msgid "Hairdresser"
 msgstr "Парикмахерская"
 
 #. item
-#: build/trans_presets.java:2486
+#: build/trans_presets.java:2487
 msgid "Edit Hairdresser"
 msgstr "Править парихмахерскую"
 
 #. item "Shops/Hairdresser" text "Name"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2491
 msgid "Shoes"
 msgstr "Обувь"
 
 #. item
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2492
 msgid "Edit Shoe Shop"
 msgstr "Редактировать обувной магазин"
 
 #. item "Shops/Shoes" text "Name"
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2496
 msgid "Toys"
 msgstr "Игрушки"
 
 #. item
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2497
 msgid "Edit Toy Shop"
 msgstr "Редактировать магазин игрушек"
 
 #. item "Shops/Toys" text "Name"
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2501
 msgid "Video"
 msgstr "Видео"
 
 #. item
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2502
 msgid "Edit Video Shop"
 msgstr "Редактировать Магазин видеозаписей"
 
 #. item "Shops/Video" text "Name"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2506
 msgid "Dry Cleaning"
 msgstr "Химчистка"
@@ -16979,10 +17308,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 "Править химчистку"
 
 #. item "Shops/Dry Cleaning" text "Name"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2512
 msgid "Laundry"
 msgstr "Прачечная"
@@ -16990,10 +17319,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 "Править прачечную"
 
 #. item "Shops/Laundry" text "Name"
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2518
 msgid "Outdoor"
 msgstr "Товары для активного отдыха"
@@ -17001,35 +17330,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 "Править магазин товаров для активного отдыха"
 
 #. item "Shops/Outdoor" text "Name"
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2524
 msgid "Sports"
 msgstr "Спорт"
 
 #. item
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2525
 msgid "Edit Sports Shop"
 msgstr "Редактировать Спортивный магазин"
 
 #. item "Shops/Sports" text "Name"
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2529
 msgid "Optician"
 msgstr "Оптик"
 
 #. item
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2530
 msgid "Edit Optician"
 msgstr "Править оптику"
 
 #. item "Shops/Optician" text "Name"
-#: build/trans_presets.java:2535
+#: build/trans_presets.java:2536
 msgid "Cash"
 msgstr "Наличные"
 
 #. group "Cash"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2537
 msgid "Bank"
 msgstr "Банк"
@@ -17037,5 +17366,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 "Править банк"
@@ -17043,10 +17372,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 "Банкомат"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2544
 msgid "Money Exchange"
 msgstr "Обмен валют"
@@ -17054,5 +17383,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 "Править обмен валют"
@@ -17060,15 +17389,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 "Править банкомат"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2557
 msgid "Health"
 msgstr "Здоровье"
 
 #. group "Health"
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2558
 msgid "Doctors"
 msgstr "Врач"
@@ -17076,20 +17405,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 "Править врача"
 
 #. item "Health/Doctors" text "Name"
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2564
 msgid "Dentist"
 msgstr "Стоматолог"
 
 #. item
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2565
 msgid "Edit Dentist"
 msgstr "Править стоматологию"
 
 #. item "Health/Dentist" text "Name"
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2569
 msgid "Pharmacy"
 msgstr "Аптека"
@@ -17097,5 +17426,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 "Править аптеку"
@@ -17103,10 +17432,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 "Отпуск лекарств по рецептам"
 
 #. item "Health/Pharmacy" text "Name"
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2576
 msgid "Hospital"
 msgstr "Больница"
@@ -17114,10 +17443,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 "Править больницу"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2582
 msgid "Emergency Access Point"
 msgstr "Пункт вызова экстренной помощи"
@@ -17126,5 +17455,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 "Править пункт вызова экстренной помощи"
@@ -17133,20 +17462,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2588
 msgid "Point Number"
 msgstr "Номер пункта"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2589
 msgid "Point Name"
 msgstr "Название точки"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2591
 msgid "Phone Number"
 msgstr "Номер телефона"
 
 #. 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 "(Используйте международный код, как например +12-345-67890)"
@@ -17154,5 +17483,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 "Ветеринар"
@@ -17161,25 +17490,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 "Править ветеринара"
 
 #. group "Places"
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2605
 msgid "Continent"
 msgstr "Континент"
 
 #. item
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2606
 msgid "Edit Continent"
 msgstr "Править континент"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2611
 msgid "Country"
 msgstr "Страна"
 
 #. item
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2612
 msgid "Edit Country"
 msgstr "Править страну"
@@ -17187,30 +17516,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 "Штат"
 
 #. item
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2618
 msgid "Edit State"
 msgstr "Править штат"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2622
+#: build/trans_presets.java:2623
 msgid "Region"
 msgstr "Область"
 
 #. item
-#: build/trans_presets.java:2623
+#: build/trans_presets.java:2624
 msgid "Edit Region"
 msgstr "Править область"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2628
+#: build/trans_presets.java:2629
 msgid "County"
 msgstr "Графство"
 
 #. item
-#: build/trans_presets.java:2629
+#: build/trans_presets.java:2630
 msgid "Edit County"
 msgstr "Править графство"
@@ -17218,15 +17547,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2635
+#: build/trans_presets.java:2636
 msgid "City"
 msgstr "Город (более 100 000)"
 
 #. item
-#: build/trans_presets.java:2636
+#: build/trans_presets.java:2637
 msgid "Edit City"
 msgstr "Править город"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2641
+#: build/trans_presets.java:2642
 msgid "Town"
 msgstr "Город (до 100 000)"
@@ -17234,10 +17563,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 "Править город"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2649
 msgid "Suburb"
 msgstr "Пригород"
@@ -17245,25 +17574,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 "Править пригород"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2656
 msgid "Village"
 msgstr "Село"
 
 #. item
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2657
 msgid "Edit Village"
 msgstr "Править село"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2662
 msgid "Hamlet"
 msgstr "Деревня"
 
 #. item
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2663
 msgid "Edit Hamlet"
 msgstr "Править деревню"
@@ -17271,5 +17600,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2669
 msgid "Locality"
 msgstr "Местность"
@@ -17277,10 +17606,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 "Править местность"
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2676
 msgid "Island"
 msgstr "Остров"
@@ -17288,5 +17617,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 "Править остров"
@@ -17294,5 +17623,5 @@
 #. item "Places/Island" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2683
+#: build/trans_presets.java:2684
 msgid "Cave Entrance"
 msgstr "Вход в пещеру"
@@ -17300,10 +17629,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 "Править вход в пещеру"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2690
 msgid "Peak"
 msgstr "Вершина"
@@ -17311,10 +17640,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 "Править вершину"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2697
 msgid "Glacier"
 msgstr "Ледник"
@@ -17322,10 +17651,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 "Править ледник"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2703
+#: build/trans_presets.java:2704
 msgid "Volcano"
 msgstr "Вулкан"
@@ -17333,70 +17662,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 "Править вулкан"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2711
+#: build/trans_presets.java:2712
 msgid "Boundaries"
 msgstr "Границы"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2713
 msgid "National"
 msgstr "Государственная"
 
 #. item
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2714
 msgid "Edit National Boundary"
 msgstr "Править государственную границу"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2718
+#: build/trans_presets.java:2719
 msgid "Administrative"
 msgstr "Административная"
 
 #. item
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2720
 msgid "Edit Administrative Boundary"
 msgstr "Править административную границу"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2724
+#: build/trans_presets.java:2725
 msgid "Civil"
 msgstr "Гражданская"
 
 #. item
-#: build/trans_presets.java:2725
+#: build/trans_presets.java:2726
 msgid "Edit Civil Boundary"
 msgstr "Править гражданскую границу"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2730
+#: build/trans_presets.java:2731
 msgid "Political"
 msgstr "Политическая"
 
 #. item
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:2732
 msgid "Edit Political Boundary"
 msgstr "Править политическую границу"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2736
+#: build/trans_presets.java:2737
 msgid "National park"
 msgstr "Национальный парк"
 
 #. item
-#: build/trans_presets.java:2737
+#: build/trans_presets.java:2738
 msgid "Edit National Park Boundary"
 msgstr "Править национальный парк"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2744
 msgid "Land use"
 msgstr "Землепользование"
 
 #. group "Land use"
-#: build/trans_presets.java:2744
+#: build/trans_presets.java:2745
 msgid "Tree"
 msgstr "Дерево"
@@ -17405,15 +17734,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 "Править дерево"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2753
 msgid "Botanical Name"
 msgstr "Научное название"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2755
 msgid "Wood"
 msgstr "Лесистая местность"
@@ -17422,5 +17751,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 "Править лесистую местность"
@@ -17428,17 +17757,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 "Хвойный"
 
-#: build/trans_presets.java:2760 build/trans_presets.java:2769
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
 msgid "deciduous"
 msgstr "Лиственный"
 
-#: build/trans_presets.java:2760 build/trans_presets.java:2769
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
 msgid "mixed"
 msgstr "Смешанный"
 
-#: build/trans_presets.java:2762
+#: build/trans_presets.java:2763
 msgid "Forest"
 msgstr "Лес"
@@ -17447,14 +17776,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 "Править лес"
 
-#: build/trans_presets.java:2771
+#: build/trans_presets.java:2772
 msgid "Nature Reserve"
 msgstr "Заповедник"
 
 #. item
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2773
 msgid "Edit Nature Reserve"
 msgstr "Править заповедник"
@@ -17462,25 +17791,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2777
+#: build/trans_presets.java:2778
 msgid "Scree"
 msgstr "Каменистая осыпь"
 
 #. item
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:2779
 msgid "Edit Scree"
 msgstr "Редактировать Каменистая осыпь"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2783
 msgid "Scrub"
 msgstr "Кустарник"
 
 #. item
-#: build/trans_presets.java:2783
+#: build/trans_presets.java:2784
 msgid "Edit Scrub"
 msgstr "Редактировать Кустарник"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2788
 msgid "Fell"
 msgstr "Вырубленный лес"
@@ -17488,10 +17817,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 "Редактировать Вырубленный лес"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2794
 msgid "Heath"
 msgstr "Пустошь"
@@ -17499,5 +17828,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 "Редактировать Здоровье"
@@ -17505,5 +17834,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2801
 msgid "Farmyard"
 msgstr "Двор фермы"
@@ -17512,45 +17841,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 "Править двор фермы"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2808
+#: build/trans_presets.java:2809
 msgid "Farmland"
 msgstr "Обрабатываемая земля"
 
 #. item
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2810
 msgid "Edit Farmland Landuse"
 msgstr "Править обрабатываемую землю"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2814
+#: build/trans_presets.java:2815
 msgid "Meadow"
 msgstr "Луг"
 
 #. item
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2816
 msgid "Edit Meadow Landuse"
 msgstr "Редактировать Луг"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2820
+#: build/trans_presets.java:2821
 msgid "Vineyard"
 msgstr "Виноградник"
 
 #. item
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2822
 msgid "Edit Vineyard Landuse"
 msgstr "Править виноградник"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2826
+#: build/trans_presets.java:2827
 msgid "Allotments"
 msgstr "Огороды"
 
 #. item
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:2828
 msgid "Edit Allotments Landuse"
 msgstr "Править огороды"
@@ -17558,25 +17887,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2833
+#: build/trans_presets.java:2834
 msgid "Garden"
 msgstr "Сад"
 
 #. item
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2835
 msgid "Edit Garden"
 msgstr "Править сад"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2838
+#: build/trans_presets.java:2839
 msgid "Grass"
 msgstr "Трава"
 
 #. item
-#: build/trans_presets.java:2839
+#: build/trans_presets.java:2840
 msgid "Edit Grass Landuse"
 msgstr "Править траву"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2845
 msgid "Village Green"
 msgstr "Село"
@@ -17584,10 +17913,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 "Редактировать Село"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:2852
 msgid "Common"
 msgstr "Общее"
@@ -17595,20 +17924,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 "Править общее"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2858
 msgid "Park"
 msgstr "Парк"
 
 #. item
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:2859
 msgid "Edit Park"
 msgstr "Править парк"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2863
 msgid "Recreation Ground"
 msgstr "Спортплощадка"
@@ -17616,5 +17945,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 "Править спортплощадку"
@@ -17622,15 +17951,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2871
 msgid "Residential area"
 msgstr "Жилая зона"
 
 #. item
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2872
 msgid "Edit Residential Landuse"
 msgstr "Править жилую зону"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2877
 msgid "Graveyard"
 msgstr "Церковное кладбище"
@@ -17638,9 +17967,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 "Править церковное кладбище"
 
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:2885
 msgid "Cemetery"
 msgstr "Кладбище"
@@ -17648,39 +17977,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 "Править кладбище"
 
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2894
 msgid "Retail"
 msgstr "Розничная торговля"
 
 #. item
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2895
 msgid "Edit Retail Landuse"
 msgstr "Править розничную торговлю"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2900
 msgid "Commercial"
 msgstr "Коммерция"
 
 #. item
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2901
 msgid "Edit Commercial Landuse"
 msgstr "Править коммерцию"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2906
 msgid "Industrial"
 msgstr "Промышленность"
 
 #. item
-#: build/trans_presets.java:2906
+#: build/trans_presets.java:2907
 msgid "Edit Industrial Landuse"
 msgstr "Править промышленность"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2912
 msgid "Railway land"
 msgstr "Железная дорога"
@@ -17688,15 +18017,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 "Править ж/д пути"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:2919
 msgid "Military"
 msgstr "Военное"
 
 #. item
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2920
 msgid "Edit Military Landuse"
 msgstr "Править военное"
@@ -17704,55 +18033,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2925
+#: build/trans_presets.java:2926
 msgid "Construction area"
 msgstr "Стройплощадка"
 
 #. item
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2927
 msgid "Edit Construction Landuse"
 msgstr "Править стройплощадку"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2932
 msgid "Brownfield"
 msgstr "Пустырь с развалинами"
 
 #. item
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:2933
 msgid "Edit Brownfield Landuse"
 msgstr "Править пустырь с развалинами"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2937
+#: build/trans_presets.java:2938
 msgid "Greenfield"
 msgstr "Пустырь"
 
 #. item
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:2939
 msgid "Edit Greenfield Landuse"
 msgstr "Править пустырь"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:2944
 msgid "Landfill"
 msgstr "Свалка"
 
 #. item
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:2945
 msgid "Edit Landfill Landuse"
 msgstr "Править свалку"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2950
 msgid "Quarry"
 msgstr "Карьер"
 
 #. item
-#: build/trans_presets.java:2950
+#: build/trans_presets.java:2951
 msgid "Edit Quarry Landuse"
 msgstr "Править карьер"
 
 #. group "Relations"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2960
 msgid "Multipolygon"
 msgstr "Мультиполигональное"
@@ -17762,5 +18091,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 "Править мультиполигональное отношение"
@@ -17769,10 +18098,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:2970
 msgid "outer segment"
 msgstr "внешний сегмент"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:2970
+#: build/trans_presets.java:2971
 msgid "inner segment"
 msgstr "внутренний сегмент"
@@ -17780,5 +18109,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:2974
 msgid "Turn restriction"
 msgstr "Ограничение на поворот"
@@ -17787,5 +18116,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 "Править ограничение на поворот"
@@ -17793,34 +18122,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 "Ограничение"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_left_turn"
 msgstr "поворот налево запрещён"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_right_turn"
 msgstr "поворот направо запрещён"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_straight_on"
 msgstr "движение прямо запрещено"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_u_turn"
 msgstr "разворот запрещён"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "only_right_turn"
 msgstr "движение только направо"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "only_left_turn"
 msgstr "движение только налево"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "only_straight_on"
 msgstr "движение только прямо"
@@ -17829,15 +18158,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2983
+#: build/trans_presets.java:2984
 msgid "from way"
 msgstr "с улицы"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2985
 msgid "via node or way"
 msgstr "через точку или линию"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2986
 msgid "to way"
 msgstr "на улицу"
@@ -17845,5 +18174,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:2988
+#: build/trans_presets.java:2989
 msgid "Route"
 msgstr "Маршрут"
@@ -17852,5 +18181,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 "Править маршрут"
@@ -17858,5 +18187,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 "Тип маршрута"
@@ -17928,5 +18257,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
@@ -17935,17 +18264,17 @@
 msgstr "велосипедный"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "bus"
 msgstr "автобусный"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "road"
 msgstr "трасса"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "ferry"
 msgstr "паромный"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "ski"
 msgstr "лыжный"
@@ -17998,5 +18327,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
@@ -18005,13 +18334,13 @@
 msgstr "пеший"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "hiking"
 msgstr "туристический"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "tram"
 msgstr "трамвайный"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "detour"
 msgstr "объездной"
@@ -18025,10 +18354,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 "метро"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:2997
 msgid "Symbol description"
 msgstr "Описание символа"
@@ -18036,26 +18365,26 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:2999
+#: build/trans_presets.java:3000
 msgid "Network"
 msgstr "Сеть"
 
 #. item "Relations/Route" combo "State"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "proposed"
 msgstr "планируемый"
 
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "alternate"
 msgstr "альтернативный"
 
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "temporary"
 msgstr "временный"
 
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "connection"
 msgstr "соединяющий"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3003
 msgid "Color (hex)"
 msgstr "Цвет (hex)"
@@ -18064,30 +18393,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:3006
 msgid "route segment"
 msgstr "сегмент маршрута"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3007
 msgid "forward segment"
 msgstr "сегмент вперёд"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3008
 msgid "backward segment"
 msgstr "сегмент назад"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3009
 msgid "halt point"
 msgstr "конечная точка"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3010
 msgid "forward halt point"
 msgstr "конечная вперёд"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3011
 msgid "backward halt point"
 msgstr "конечная назад"
@@ -22202,7 +22531,19 @@
 msgstr ""
 
+#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
+#~ msgstr "Используйте мышь, или Ctrl+стрелки/./ для изменения масштаба."
+
 #~ msgid "Uploading data"
 #~ msgstr "Загрузка данных"
 
+#~ msgid "Email"
+#~ msgstr "Электронная почта"
+
+#~ msgid "Login name (email) to the OSM account."
+#~ msgstr "Имя пользователя (e-mail) учётной записи OSM"
+
+#~ msgid "OSM username (email)"
+#~ msgstr "Имя пользователя OSM (e-mail)"
+
 #~ msgid "Unknown host"
 #~ msgstr "Неизвестный хост"
@@ -22210,4 +22551,11 @@
 #~ msgid "Add either site-josm.xml or Wiki Pages."
 #~ msgstr "Добавьте site-josm.xml, либо страницы Wiki"
+
+#~ msgid ""
+#~ "Server returned internal error. Try a reduced area or retry after waiting "
+#~ "some time."
+#~ msgstr ""
+#~ "Сервер сообщил о внутренней ошибке. Попробуйте уменьшить область, или "
+#~ "повторите попытку позже."
 
 #~ msgid "Commit comment"
@@ -22266,6 +22614,64 @@
 #~ msgstr "Вы действительно желаете отметить проблему, как решённую?"
 
+#~ 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 URL.<br><b>Do not use a valuable Password.</b></html>"
+#~ msgstr ""
+#~ "<html>Внимание! Пароль хранится в открытом виде в файле настроек.<br> "
+#~ "Пароль передаётся по сети в открытом виде, как параметр запроса.<br><b>Не "
+#~ "используйте ценный пароль.</b></html>"
+
 #~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS"
 #~ msgstr "Скачать трансформированное изображение с WMS сервера Metacarta"
+
+#~ msgid ""
+#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab "
+#~ "- these will then show up in the WMS menu.\n"
+#~ "\n"
+#~ "You can also do this manually in the Advanced Preferences, using the "
+#~ "following schema:\n"
+#~ "wmsplugin.url.1.name=Landsat\n"
+#~ "wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n"
+#~ "wmsplugin.url.2.name=NPE Maps... etc\n"
+#~ "\n"
+#~ "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"
+#~ "\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"
+#~ "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"
+#~ "Note: Make sure the image is suitable, copyright-wise, if in doubt, don't "
+#~ "use."
+#~ msgstr ""
+#~ "Вы можете добавлять, редактировать и удалять записи WMS на закладке  "
+#~ "WMSplugin в установках - тогда они будут отображаться в меню WMS.\n"
+#~ "\n"
+#~ "Вы также можете сделать это вручную в Расширенных настройках, используя "
+#~ "следующую схему:\n"
+#~ "wmsplugin.url.1.name=Landsat\n"
+#~ "wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n"
+#~ "wmsplugin.url.2.name=NPE Maps... etc\n"
+#~ "\n"
+#~ "Пример полного формата  WMS URL (Landsat)\n"
+#~ "http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n"
+#~ "layers=global_mosaic&styles=&srs=EPSG:4326&\n"
+#~ "format=image/jpeg \n"
+#~ "\n"
+#~ "Для карты Metacarta  Rectifier http://labs.metacarta.com/rectifier/, вам "
+#~ "нужно всего лишь ввести соответствующие \"ID\".\n"
+#~ "Чтобы добавить карту Metacarta Rectifier нужно в меню вручную создать "
+#~ "URL, как в этом примере, вместо 73 с 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"
+#~ "Примечание: Убедитесь, что изображение согласовано с координатам, если "
+#~ "есть сомнения в лицензионных правах на изображение, то не используйте его."
 
 #~ msgid "Portcullis"
@@ -22291,10 +22697,37 @@
 #~ msgstr "виадук"
 
+#~ msgid "Open the OpenStreetBugs window and activate the automatic download"
+#~ msgstr "Открыть окно OpenStreetBugs, и включить автоматическое скачивание"
+
 #~ msgid "sports"
 #~ msgstr "Спортивный"
 
+#~ msgid ""
+#~ "Lambert zone {0} in cache  incompatible with current Lambert zone {1}"
+#~ msgstr "Зона Ламберта {0} в кеше несовместима с текущей зоной Ламберта {1}"
+
 #~ msgid "Delete and Download"
 #~ msgstr "Удалить и скачать"
 
+#~ msgid "No intersections found. Nothing was changed."
+#~ msgstr "Пересечения найдено. Ничего не изменялось."
+
+#~ msgid ""
+#~ "This action will require {0} individual download requests. Do you wish to "
+#~ "continue?"
+#~ msgstr ""
+#~ "Это действие потребует {0} персонифицированного запроса на скачивание. Вы "
+#~ "желаете продолжить?"
+
+#~ msgid ""
+#~ "An error occured while trying to match the photos to the GPX track. You "
+#~ "can adjust the sliders to manually match the photos."
+#~ msgstr ""
+#~ "Произошла ошибка при попытке сопоставить фотографии с GPX треком. Вы "
+#~ "можете настроить вручную с помощью ползунов соответствие фотографиям."
+
+#~ msgid "The following errors occured during mass download:"
+#~ msgstr "Эта ошибка вызвана в течении массовой загрузки:"
+
 #~ msgid "Edit Drawbridge"
 #~ msgstr "Править подъёмный мост"
@@ -22302,4 +22735,15 @@
 #~ msgid "Edit Portcullis"
 #~ msgstr "Править опускающуюся решётку"
+
+#~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">english</A>."
+#~ msgstr ""
+#~ "Страница справки отсутствует. Создайте её в<A HREF=\"{0}\">english</A>."
+
+#~ msgid ""
+#~ "Helppage missing. Create it in <A HREF=\"{0}\">english</A> or <A HREF="
+#~ "\"{1}\">your language</A>."
+#~ msgstr ""
+#~ "Страница справки отсутствует. Создайте её в <A HREF=\"{0}\">english</A> "
+#~ "или <A HREF=\"{1}\">вашем языке</A>."
 
 #~ msgid ""
@@ -22321,4 +22765,7 @@
 #~ msgstr "Не инициализированно"
 
+#~ msgid "Cannot read numeric value from response"
+#~ msgstr "Не возможно прочесть числовое знаечение из ответа"
+
 #~ msgid "Data upload failed for unknown reason"
 #~ msgstr "Выгрузка прервана по неизвестной причине"
Index: applications/editors/josm/i18n/po/sk.po
===================================================================
--- applications/editors/josm/i18n/po/sk.po	(revision 16008)
+++ applications/editors/josm/i18n/po/sk.po	(revision 16009)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-14 16:51+0200\n"
-"PO-Revision-Date: 2009-06-13 05:07+0000\n"
+"POT-Creation-Date: 2009-06-19 21:52+0200\n"
+"PO-Revision-Date: 2009-06-19 04:19+0000\n"
 "Last-Translator: Vlado <babicvm@szm.sk>\n"
 "Language-Team: Slovak <sk@li.org>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
-"X-Launchpad-Export-Date: 2009-06-14 14:46+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 "Nápoveda"
 
 #: ../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 ""
 "Typ projekcie nie je možné prečítať z nastavení. Použije sa Mercator "
@@ -72,6 +72,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
@@ -88,8 +90,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
@@ -138,5 +140,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"
@@ -535,5 +537,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}"
@@ -605,6 +607,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:92
-msgid "Email"
-msgstr "E-mail"
+msgid "E-Mail"
+msgstr "E-Mail"
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:96
@@ -642,12 +644,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
@@ -674,5 +678,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
@@ -705,14 +709,15 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:207
 #, java-format
-msgid "Helppage missing. Create it in <A HREF=\"{0}\">english</A>."
-msgstr "Stránka s nápovedou chýba. Vytvorte to v <A HREF=\"{0}\">english</A>."
+msgid "Help page missing. Create it in <A HREF=\"{0}\">english</A>."
+msgstr ""
+"Chýbajúca stránka s pomocou. Vytvorte to v <A HREF=\"{0}\">english</A>."
 
 #: ../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 ""
-"Stránka s nápovedou chýba. Vytvorte to v <A HREF=\"{0}\">english</A> alebo "
+"Chýbajúca stránka s pomocou. Vytvorte to v  <A HREF=\"{0}\">english</A> or "
 "<A HREF=\"{1}\">váš jazyk</A>."
 
@@ -1145,13 +1150,13 @@
 msgstr "Pomoc: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:99
 msgid "Status Report"
 msgstr "Správa o stave"
 
-#: ../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 "Kopírovať do schránky a zavrieť"
 
-#: ../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
@@ -1358,16 +1363,14 @@
 msgstr "Odznačiť všetko (Escape)"
 
-#: ../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 "Aktualizovať údaje"
 
-#: ../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 "Aktualizácia zvolenej údajovej vrstvy zo servera (re-downloads data)"
 
-#: ../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?"
@@ -1376,88 +1379,262 @@
 "údajovú vrstvu?"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:70
+msgid "Undeleting Way..."
+msgstr "Obnovovanie cesty..."
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:133
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:247
+msgid "Yes, undelete them too"
+msgstr "Áno, obnoviť ich tiež"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:248
+msgid "No, cancel operation"
+msgstr "Nie, zrušiť operáciu"
+
+#: ../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 ""
-"Táto činnosť vyžaduje {0} individuálne požiadavky na stiahnutie. Prajete si "
-"pokračovať?"
-
-#: ../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 ""
+"<html>Sú tam {0} ďalšie body použité v ceste {1}<br>ktoré sú vymazané na "
+"servery.<br><br>Chcete obnoviť tieto body tiež?</html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:143
+msgid "Undelete additional nodes?"
+msgstr "Obnoviť pridané body?"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:170
+#, java-format
+msgid "Checking whether node {0} is gone ..."
+msgstr "Kontrolujem či body {0} sú úplné(gone) ..."
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:203
+msgid "Undeleting relation..."
+msgstr "Obnovujem reláciu..."
+
+#: ../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 ""
+"<html>Sú tam {0} ďalšie pôvodné odkazy na reláciu {1}<br>ktoré sú zmazané na "
+"servery.<br><br>Chcete ich obnoviť tiež?</html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:257
+msgid "Undelete dependent primitives?"
+msgstr "Obnoviť pôvodné závislé odkazy?"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:284
+#, java-format
+msgid "Checking whether primitive {0} is gone ..."
+msgstr "Kontrolujem či sú závislosti {0} is gone ..."
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:339
+msgid "Keep mine"
+msgstr "Ponechať zdroj"
+
+#: ../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 "Uložiť do OSM..."
 
-#: ../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 "Uložiť všetky zmeny na OSM server."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:96
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:94
 msgid "Objects to add:"
 msgstr "Pridané objekty:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102
 msgid "Objects to modify:"
 msgstr "Upravené objekty:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:110
 msgid "Objects to delete:"
 msgstr "Odstránené objekty:"
 
-#: ../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 "Doplniť krátky komentár k nahrávaným zmenám"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:126
 msgid "Upload these changes?"
 msgstr "Uložiť tieto úpravy?"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:130
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
 msgid "Upload Changes"
 msgstr "Nahrať zmeny"
 
-#: ../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 "Nie je nič k nahratiu. Najskôr musíte mať nejaké dáta."
 
-#: ../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 "Sú tu nevyriešené konflikty. Musíte jich najskôr vyriešiť."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:182
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:180
 msgid "No changes to upload."
 msgstr "Žiadne zmeny pre uloženie."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:203
 msgid "Uploading"
 msgstr "Nahrávanie"
 
-#: ../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 "Nahrávanie na OSM API neúspešné"
 
-#: ../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 ""
@@ -1565,37 +1742,51 @@
 msgstr "Nekomprimované (Raw) GPS dáta"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:44
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:46
 msgid "Downloading data"
 msgstr "Sťahujem dáta"
 
-#: ../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 "Neboli importované žiadne dáta."
 
-#: ../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 "Údajová vrstva {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 "údaje OpenStreetMap"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:37
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:45
 msgid "Data Layer"
 msgstr "Vrstva údajov"
 
-#: ../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 "Stiahnuté {0} z {1} ({2} ostáva(left))"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:88
-msgid "The following errors occured during mass download:"
-msgstr "V priebehu sťahovania nastala nasledujúca chyba :"
-
-#: ../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 "Chyby v priebehu sťahovania"
+
+#: ../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
@@ -1648,34 +1839,34 @@
 msgstr "Nemôžem pridať body ležiace mimo svet."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:495
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:493
 msgid "Add node"
 msgstr "Pridať bod"
 
-#: ../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 "Pridať bod do cesty"
 
-#: ../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 "Pripojiť existujúcu cestu do bodu"
 
-#: ../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 "Pridať nový bod do existujúcej cesty"
 
-#: ../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 "Pridať bod do cesty a spojiť"
 
-#: ../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 "Vytvoriť nový bod."
 
-#: ../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 "Zvoliť bod pod kurzorom."
 
-#: ../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."
@@ -1685,14 +1876,14 @@
 msgstr[2] "Vložiť nový bod do {0} ciest."
 
-#: ../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 "Začiatok novej cesty z posledného bodu."
 
-#: ../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 "Pokračovanie cesty z posledného bodu."
 
-#: ../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 "Koniec kreslenia."
@@ -2025,26 +2216,32 @@
 msgstr "Nesprávna hodnota pre id operátor: {0}.  Číslo je očakávané."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:33
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:34
 msgid "Load Selection"
 msgstr "Nahrať výber"
 
-#: ../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 "Kontakt {0}..."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:45
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:46
 msgid "Downloading..."
 msgstr "Sťahujem ..."
 
-#: ../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 "Nemôžem čítať z URL:\"{0}\""
 
-#: ../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 "Chyba parsovania v URL:\"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:74
+msgid "Error while communicating with server."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67
@@ -2106,13 +2303,85 @@
 msgstr "Vyriešiť {0} konfliktov v {1} objektoch."
 
-#: ../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 "Vyriešte rozpor v súradniciach v {0}"
+
+#. 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 "nemôžem vyriešiť nerozhodnutý konflikt"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81
+#, java-format
+msgid "Delete {1} {0}"
+msgstr "Zmazať {1} {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97
+#, java-format
+msgid "Delete {0} {1}"
+msgstr "Zmazať {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153
+msgid "Conflicting relation"
+msgstr "Konfliktné vzťahy (relation)"
+
+#: ../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 ""
+"Výber \"{0}\" je používaný vo vzťahu (relation) \"{1}\" s funkciou {2}.\n"
+"Zmazať zo vzťahu (relation)?"
+
+#: ../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 "Zmazať z relácie (zo vzťahu"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
+#, java-format
+msgid ""
+"Selection \"{0}\" is used by relation \"{1}\".\n"
+"Delete from relation?"
+msgstr ""
+"Výber \"{0}\" je používaný vo vzťahu (relation) \"{1}\".\n"
+"Zmazať zo vzťahu (relation)?"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:366
+msgid "Split way segment"
+msgstr "Rozdeliť segment cesty"
+
+#. 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 ""
+"Chystáte sa zmazať body mimo Vami stiahnutú oblasť.<br>Toto môže spôsobiť "
+"problém iným objektom (nevidíte ich), ktoré môžu používať tieto body."
+"<br>Naozaj ich chcete zmazať?"
+
+#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:53
+#, java-format
+msgid "Resolve conflicts in deleted state in {0}"
+msgstr "Vyriešte konflikty v zmazaných (state) v {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118
+msgid "Move"
+msgstr "Presunúť"
+
 #: ../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"
@@ -2122,10 +2391,219 @@
 msgstr[2] "bodov"
 
-#: ../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 "Odstrániť súvisiaceho(vzťahového) člena"
+
+#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
+msgid "Rotate"
+msgstr "Otočiť"
+
+#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88
+msgid "Sequence"
+msgstr "Sekvencia"
+
+#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:72
+#, java-format
+msgid "Resolve {0} tag conflicts in {1} {2}"
+msgstr "Vyriešte {0} konfliktov značiek v {1} {2}"
+
+#: ../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 "Vyriešte konflikt verzií pre {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52
+#, java-format
+msgid "Resolve conflicts in node list of of way {0}"
+msgstr "Vyriešte konflikt v poradí bodov v ceste {0}"
+
+#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
+msgid "Apply?"
+msgstr "Použiť?"
+
+#: ../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 ""
+"Keď otáčate túto cestu, nasledujúce zmeny vo vlastnostiach cesty a jej bodov "
+"sú navrhované v takom poradí aby zachovali konzistenciu dát."
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28
+msgid "Relation"
+msgstr "Vzťah (relation)"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30
+msgid "Old role"
+msgstr "Stará funkcia"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:32
+msgid "New role"
+msgstr "Nová funkcia"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
+msgid "Old key"
+msgstr "Starý kľúč"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
+msgid "Old value"
+msgstr "Stará hodnota"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
+msgid "New key"
+msgstr "Nový kľúč"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
+msgid "New value"
+msgstr "Nová hodnota"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:40
+msgid "Apply selected changes"
+msgstr "Použiť zvolené zmeny"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41
+msgid "Don't apply changes"
+msgstr "Neurobiť zmeny"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:83
+msgid "Please select which property changes you want to apply."
+msgstr "Prosím vyberte, ktoré zmenené vlastnosti chcete použiť."
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:96
+msgid "Properties of "
+msgstr "Vlastnosti "
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:120
+msgid "Roles in relations referring to"
+msgstr "Funkcie vo vzťahoch (relations) odkazujú na"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:136
+msgid "Automatic tag correction"
+msgstr "Automatická úprava značiek (tag)"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:314
+#, java-format
+msgid "Malformed config file at lines {0}"
+msgstr "Poškodený konfiguračný súbor pri linke {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:324
+#, java-format
+msgid "Cannot open preferences directory: {0}"
+msgstr "Nemôžem otvoríť adresár s nastavením: {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 "Súbor s nastaveniami má chyby. Vytváram zálohu starého do {0}."
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:79
+#, java-format
+msgid "Preferences stored on {0}"
+msgstr "Predvoľby uložené na {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:82
+#, java-format
+msgid "Could not upload preferences. Reason: {0}"
+msgstr "Nemôžem nahrať predvoľby. Dôvod: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:93
+msgid "Could not load preferences from server."
+msgstr "Nemôžem nahrať predvoľby zo servera."
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:34
+msgid "different"
+msgstr "rôzne"
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:262
+msgid "deleted"
+msgstr "zmazané"
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
+msgid "true"
+msgstr "áno (pravda)"
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
+msgid "false"
+msgstr "nie (nepravda)"
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20
+msgid "position"
+msgstr "pozícia (miesto)"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30
+msgid "Decimal Degrees"
+msgstr "Stupne"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
+msgid "Degrees Minutes Seconds"
+msgstr "Stupne minúty sekundy"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+msgid "S"
+msgstr "J"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+msgid "N"
+msgstr "S"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+msgid "W"
+msgstr "Z"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+msgid "E"
+msgstr "V"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/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 "neúplný"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
+#, java-format
+msgid "Error: {0}"
+msgstr "Chyba: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
+#, java-format
+msgid "Warning: {0}"
+msgstr "Varovanie: {0}"
+
+#: ../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"
@@ -2135,8 +2613,10 @@
 msgstr[2] "ciest"
 
-#: ../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
@@ -2148,265 +2628,27 @@
 msgstr[2] "vzťahov (relations)"
 
-#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:68
-#, java-format
-msgid "Resolve conflicts in coordinates in {0}"
-msgstr "Vyriešte rozpor v súradniciach v {0}"
-
-#. 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 "nemôžem vyriešiť nerozhodnutý konflikt"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81
-#, java-format
-msgid "Delete {1} {0}"
-msgstr "Zmazať {1} {0}"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97
-#, java-format
-msgid "Delete {0} {1}"
-msgstr "Zmazať {0} {1}"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153
-msgid "Conflicting relation"
-msgstr "Konfliktné vzťahy (relation)"
-
-#: ../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 ""
-"Výber \"{0}\" je používaný vo vzťahu (relation) \"{1}\" s funkciou {2}.\n"
-"Zmazať zo vzťahu (relation)?"
-
-#: ../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 "Zmazať z relácie (zo vzťahu"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
-#, java-format
-msgid ""
-"Selection \"{0}\" is used by relation \"{1}\".\n"
-"Delete from relation?"
-msgstr ""
-"Výber \"{0}\" je používaný vo vzťahu (relation) \"{1}\".\n"
-"Zmazať zo vzťahu (relation)?"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:366
-msgid "Split way segment"
-msgstr "Rozdeliť segment cesty"
-
-#. 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 ""
-"Chystáte sa zmazať body mimo Vami stiahnutú oblasť.<br>Toto môže spôsobiť "
-"problém iným objektom (nevidíte ich), ktoré môžu používať tieto body."
-"<br>Naozaj ich chcete zmazať?"
-
-#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:53
-#, java-format
-msgid "Resolve conflicts in deleted state in {0}"
-msgstr "Vyriešte konflikty v zmazaných (state) v {0}"
-
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118
-msgid "Move"
-msgstr "Presunúť"
-
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:52
-#, java-format
-msgid "Resolve conflicts in member list of of relation {0}"
-msgstr "Vyriešte rozpor v poradovom čísle relácie {0}"
-
-#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66
-msgid "RemoveRelationMember"
-msgstr "Odstrániť súvisiaceho(vzťahového) člena"
-
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
-msgid "Rotate"
-msgstr "Otočiť"
-
-#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88
-msgid "Sequence"
-msgstr "Sekvencia"
-
-#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:84
-#, java-format
-msgid "Resolve {0} tag conflicts in {1} {2}"
-msgstr "Vyriešte {0} konfliktov značiek v {1} {2}"
-
-#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:57
-#, java-format
-msgid "Resolve version conflicts for {0} {1}"
-msgstr "Vyriešte konflikt verzií pre {0} {1}"
-
-#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52
-#, java-format
-msgid "Resolve conflicts in node list of of way {0}"
-msgstr "Vyriešte konflikt v poradí bodov v ceste {0}"
-
-#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
-msgid "Apply?"
-msgstr "Použiť?"
-
-#: ../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 ""
-"Keď otáčate túto cestu, nasledujúce zmeny vo vlastnostiach cesty a jej bodov "
-"sú navrhované v takom poradí aby zachovali konzistenciu dát."
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28
-msgid "Relation"
-msgstr "Vzťah (relation)"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30
-msgid "Old role"
-msgstr "Stará funkcia"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:32
-msgid "New role"
-msgstr "Nová funkcia"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
-msgid "Old key"
-msgstr "Starý kľúč"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
-msgid "Old value"
-msgstr "Stará hodnota"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
-msgid "New key"
-msgstr "Nový kľúč"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
-msgid "New value"
-msgstr "Nová hodnota"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:40
-msgid "Apply selected changes"
-msgstr "Použiť zvolené zmeny"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41
-msgid "Don't apply changes"
-msgstr "Neurobiť zmeny"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:83
-msgid "Please select which property changes you want to apply."
-msgstr "Prosím vyberte, ktoré zmenené vlastnosti chcete použiť."
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:96
-msgid "Properties of "
-msgstr "Vlastnosti "
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:120
-msgid "Roles in relations referring to"
-msgstr "Funkcie vo vzťahoch (relations) odkazujú na"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:136
-msgid "Automatic tag correction"
-msgstr "Automatická úprava značiek (tag)"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:314
-#, java-format
-msgid "Malformed config file at lines {0}"
-msgstr "Poškodený konfiguračný súbor pri linke {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:324
-#, java-format
-msgid "Cannot open preferences directory: {0}"
-msgstr "Nemôžem otvoríť adresár s nastavením: {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 "Súbor s nastaveniami má chyby. Vytváram zálohu starého do {0}."
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:79
-#, java-format
-msgid "Preferences stored on {0}"
-msgstr "Predvoľby uložené na {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:82
-#, java-format
-msgid "Could not upload preferences. Reason: {0}"
-msgstr "Nemôžem nahrať predvoľby. Dôvod: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:93
-msgid "Could not load preferences from server."
-msgstr "Nemôžem nahrať predvoľby zo servera."
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:34
-msgid "different"
-msgstr "rôzne"
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:262
-msgid "deleted"
-msgstr "zmazané"
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
-msgid "true"
-msgstr "áno (pravda)"
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
-msgid "false"
-msgstr "nie (nepravda)"
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20
-msgid "position"
-msgstr "pozícia (miesto)"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30
-msgid "Decimal Degrees"
-msgstr "Stupne"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
-msgid "Degrees Minutes Seconds"
-msgstr "Stupne minúty sekundy"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
-msgid "S"
-msgstr "J"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
-msgid "N"
-msgstr "S"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
-msgid "W"
-msgstr "Z"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
-msgid "E"
-msgstr "V"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:108
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:83
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:115
-msgid "incomplete"
-msgstr "neúplný"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
-#, java-format
-msgid "Error: {0}"
-msgstr "Chyba: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
-#, java-format
-msgid "Warning: {0}"
-msgstr "Varovanie: {0}"
-
-#: ../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"
@@ -2421,5 +2663,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:122
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "railway"
 msgstr "železnica"
@@ -2442,4 +2684,62 @@
 msgstr[2] "{0} bodov"
 
+#: ../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."
@@ -2587,5 +2887,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 "pozadie"
@@ -2674,8 +2974,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
@@ -2687,7 +2987,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
@@ -2796,10 +3096,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 "Meno používateľa"
 
 #: ../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 "Heslo"
@@ -2896,22 +3196,22 @@
 msgstr "Nastavenie predvoľby {0} bolo vymazané, pretože nebola dlho používaná."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:146
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148
 msgid "File"
 msgstr "Súbor"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150
 msgid "View"
 msgstr "Zobraziť"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:149
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151
 msgid "Tools"
 msgstr "Nástroje"
 
-#: ../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 "Predvoľby"
 
-#: ../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
@@ -2924,21 +3224,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 "Drôtový model"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:218
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221
 msgid "Toggle Wireframe view"
 msgstr "Prepnúť drôtový model"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:244
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:247
 msgid "Full Screen"
 msgstr "Celá obrazovka"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:246
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:249
 msgid "Toggle Full Screen view"
 msgstr "Prepínač pohladu na celej obrazovke"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:286
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:289
 msgid "Audio"
 msgstr "Zvuk"
@@ -3010,6 +3310,6 @@
 msgstr "(žiadny objekt)"
 
-#: ../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 "vrstva nie je v zozname"
@@ -3019,9 +3319,9 @@
 msgstr "Pripája sa na OSM server..."
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:104
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:105
 msgid "Error while parsing"
 msgstr "Chyba pri rozkladaní"
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:107
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:108
 msgid "File not found"
 msgstr "Súbor nebol nájdený"
@@ -3093,5 +3393,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 "Členovia"
@@ -3304,5 +3604,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
@@ -3391,5 +3691,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 "parameter '{0}' nesmie byť nulový"
@@ -3430,5 +3730,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 ""
 
@@ -3482,5 +3782,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 "Úloha"
@@ -3585,5 +3885,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
@@ -3904,5 +4204,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 "Relácie"
@@ -4011,66 +4311,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 "Použiť zmeny"
 
-#: ../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 "Základný"
 
-#: ../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 "Využité (kým)"
 
-#: ../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 "zviazané"
 
-#: ../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 "Značky (prázdne hodnoty zmazaných značiek)"
 
-#: ../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 "Posunút Hore"
 
-#: ../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 "Pridať všetky zvolené objekty medzi členy"
 
-#: ../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 "Pridať vybrané"
 
-#: ../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 "Pridať všetky zvolené objekty medzi členy"
 
-#: ../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 "Odstrániť označené"
 
-#: ../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 "Odstrániť všetky vybrané objekty z relácie(zo vzťahu)"
 
-#: ../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 "Posunúť dole"
 
-#: ../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 "Presunúť zvolenú vrstvu o riadok dolu."
 
-#: ../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 "Odstrániť člena(member) v aktuálnom riadku tabuľky z tejto relácie"
 
-#: ../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 "Stiahnuť členov"
 
-#: ../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 "Stiahnuť všetky nekompletné cesty a uzly v relácii"
@@ -4115,5 +4415,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
@@ -4134,9 +4434,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 "áno"
 
-#: ../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
@@ -4158,31 +4458,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 "nie"
 
-#: ../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 "Členov: {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 "Editor relácie: {0}"
 
-#: ../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 "Vznikli konflikty počas importu"
 
-#: ../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 "Chyba parsovania odozvy servera"
 
-#: ../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 "Nemôžem sa pripojiť na server."
+
+#: ../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
@@ -4248,18 +4551,18 @@
 msgstr "Zdroje a typy dát"
 
-#: ../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 "Načítať na novú vrstvu"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:174
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:173
 msgid "Download Area"
 msgstr "Stiahnuť plochu"
 
-#: ../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 ""
 "Sťahovaná plocha je príliš veľká, server zrejme odmietne vašu požiadavku"
 
-#: ../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 "Sťahovaná plocha je v poriadku, veľkosť je akceptovaná serverom"
@@ -4287,5 +4590,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 "Miesta"
@@ -4332,21 +4635,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 "typ"
@@ -4386,15 +4689,4 @@
 msgid "Tile Numbers"
 msgstr "Čísla dlaždíc"
-
-#: ../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 ""
-"Môžete použiť koliesko myši alebo Ctrl+Šípky pre zväčšenie, alebo  posun"
-
-#. 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 "Mapa"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:98
@@ -4474,5 +4766,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)"
@@ -4588,14 +4880,14 @@
 msgstr "Wave Audiosúbory (*.wav)"
 
-#: ../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 "Zukové značky z {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244
 msgid "Import images"
 msgstr "Importovať obrázky"
 
-#: ../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, "
@@ -4605,5 +4897,5 @@
 msgstr[2] "{0} stôp(track), "
 
-#: ../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, "
@@ -4613,5 +4905,5 @@
 msgstr[2] "{0} trás, "
 
-#: ../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"
@@ -4621,28 +4913,28 @@
 msgstr[2] "{0} waypointov (bodov cesty)"
 
-#: ../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 "Meno: {0}"
 
-#: ../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 "Popis: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347
 msgid "Timespan: "
 msgstr "Časové rozpätie: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354
 msgid "Length: "
 msgstr "Dĺžka: "
 
-#: ../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 "Konvertovať do dátovej vrstvy"
 
-#: ../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 ""
@@ -4653,11 +4945,11 @@
 "chcete nahrať stopy (traces), pozrite sem:"
 
-#: ../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
@@ -4667,29 +4959,29 @@
 msgstr "Prevedené z: {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 "Stiahnuť z OSM okolie tejto stopy (track)"
 
-#: ../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 "Stiahnuť všetko vo vnútry:"
 
-#: ../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 "{0} metrov"
 
-#: ../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 "Maximálna plocha na požiadavku:"
 
-#: ../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 "{0} štvorcových km"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:822
 #, java-format
 msgid ""
@@ -4700,9 +4992,9 @@
 "<br>Chcete pokračovať?</html>"
 
-#: ../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 "Vo vrstve nie je žiadna GPX stopa ku ktorej by sa dal pripojiť zvuk."
 
-#: ../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 "
@@ -4712,5 +5004,5 @@
 "alebo za koncom, boli vynechané, alebo presunuté na začiatok."
 
-#: ../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 "
@@ -4720,33 +5012,42 @@
 "ich času boli vynechané."
 
-#: ../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 "mimo ukladanej oblasti"
 
-#: ../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 "verzia {0}"
 
-#: ../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 "{0} se skladá z:"
 
-#: ../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} zmazané.)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:371
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:396
 msgid "unset"
 msgstr "neuršený (unset)"
 
-#: ../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 "Verzia API: {0}"
 
-#: ../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"
@@ -4754,21 +5055,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"
@@ -4926,5 +5227,5 @@
 msgstr "Východzia hodnota nie je známa (ešte nebola definovaná)"
 
-#: ../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
@@ -4933,5 +5234,5 @@
 msgstr "Prosím vyberte riadok na úpravu."
 
-#: ../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
@@ -4939,5 +5240,5 @@
 msgstr "Nová hodnota pre {0}"
 
-#: ../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
@@ -4947,5 +5248,5 @@
 msgstr "Prosím vyberte riadok na odstránenie."
 
-#: ../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 "Zadajte novú dvojicu klúč/hodnota"
@@ -5835,106 +6136,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 "Názov"
@@ -6413,6 +6714,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:36
-msgid "Login name (email) to the OSM account."
-msgstr "Prihlasovacie meno (email) k OSM účtu."
+msgid "Login name (e-mail) to the OSM account."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
@@ -6427,6 +6728,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
-msgid "OSM username (email)"
-msgstr "OSM používateľské meno (email)"
+msgid "OSM username (e-mail)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
@@ -6437,10 +6738,7 @@
 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 ""
-"<html>Upozornenie: Heslo je uložené v nešifrovanej podobe v konfiguračnom "
-"súbore.<br>Heslo sa prenáša v nešifrovanej podobe v URL na server."
-"<br><b>Nepoužívajte dôležité heslo.</b></html>"
 
 #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on
@@ -6757,6 +7055,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 "Pripája sa na OSM Server..."
@@ -6767,7 +7066,7 @@
 msgstr "Sťahujem body {0} až {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 "Sťahujem OSM údaje..."
@@ -6832,11 +7131,10 @@
 msgstr "NMEA import zlyhal!"
 
-#: ../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 ""
@@ -6844,5 +7142,5 @@
 "nastaveniach."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:207
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172
 #, java-format
 msgid ""
@@ -6853,31 +7151,37 @@
 "{1}."
 
-#: ../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 "Komunikácia s {0} je ustálená, používa protokol verzie {1}"
 
-#: ../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 "Nemôžem čítať číselné hodnoty z odpovede"
-
-#: ../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 "Otváranie kontroly..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:351
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298
 msgid "Closing changeset..."
 msgstr "Zatváranie kontroly..."
 
-#: ../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 "Nie sú prítomné zmenené súbory(changeset) pre diff nahratie."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:376
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:321
 msgid "Preparing..."
 msgstr "Pripravujem..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:381
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:326
 msgid "Uploading..."
 msgstr "Nahrávam..."
@@ -6892,25 +7196,25 @@
 msgstr "Poškodený bz2 súbor."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:80
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:73
 msgid "Incorrect password or username."
 msgstr "Nesprávne heslo alebo meno."
 
-#: ../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 "Upozornenie: Heslo sa posiela nešifrované."
 
-#: ../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 "Uložiť meno a heslo (nešifrovane)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:89
 msgid "Enter Password"
 msgstr "Zadajte heslo"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
 msgid "Login"
 msgstr "Prihlásenie"
 
-#: ../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..."
@@ -6921,4 +7225,47 @@
 msgstr "OSM Serverové Súbory gzip zbalené"
 
+#: ../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."
@@ -7012,9 +7359,23 @@
 msgstr "Zle formulované id bodu"
 
-#: ../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 "Kontaktujem server..."
 
-#: ../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."
@@ -7023,17 +7384,9 @@
 "internetu."
 
-#: ../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 vrátil vnútornú chybu. Skúste to za chvíľu znovu alebo skúste zmenšiť "
-"oblasť."
-
-#: ../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 ""
 
@@ -7049,5 +7402,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 "Stiahnuť pluginy"
@@ -7239,9 +7592,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 "Stiahnuť chýbajúca pluginy"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:128
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:119
 #, java-format
 msgid ""
@@ -7254,6 +7607,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
@@ -7276,35 +7629,35 @@
 msgstr "neznámy"
 
-#: ../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}: Verzie {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 je zahrnutý v JOSM"
 
-#: ../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 "Chyba čítania súboru informací o plugine: {0}"
 
-#: ../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 "Toto je až za koncom nahrávky"
 
-#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:329
+#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:340
 msgid "Error playing sound"
 msgstr "Chyba prehrávánia zvuku"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
 msgid "Do nothing"
 msgstr "Neurobiť nič"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
 msgid "Report Bug"
 msgstr "Nahlásiť chybu"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:52
 msgid ""
 "An unexpected exception occurred.\n"
@@ -7318,18 +7671,18 @@
 "chybe."
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55
 msgid "Unexpected Exception"
 msgstr "Neočakávaná chyba programu."
 
-#: ../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 "Prosíme napíšte chybovú správu v {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 "Opíšte (detailne) kroky, ktoré vedú k chybe."
 
-#: ../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 "
@@ -7339,9 +7692,9 @@
 "hlásením chyby."
 
-#: ../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 "Prosím pripojte nasledujúcu informáciu:"
 
-#: ../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 "(Text už bol skopírovaný do schránky.)"
@@ -7427,5 +7780,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 "Popis"
@@ -7806,9 +8159,7 @@
 #: ../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 ""
-"Stala sa nejaká chyba, pri skúške či sa hodia fotky ku GPX stope. Môžete "
-"nastaviť posúvatko na manuálne priradenie fotiek."
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:853
@@ -7840,5 +8191,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"
@@ -7861,5 +8211,5 @@
 msgstr "Lambert Zóna 4 cache súbor (.4)"
 
-#: ../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
@@ -7954,6 +8304,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/"
@@ -8039,6 +8389,6 @@
 msgstr "Pridať \"source=...\" do položiek?"
 
-#: ../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
@@ -8046,11 +8396,11 @@
 msgstr "Sťahujem {0}"
 
-#: ../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 "Kontaktujem WMS server..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:157
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:158
 msgid "Create buildings"
 msgstr "Vytvoriť budovy"
@@ -8069,13 +8419,13 @@
 msgstr "Prosím, zapnite automatický zdroj a kontrolu štvorcov máp katastra."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:61
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:62
 msgid "Extract SVG ViewBox..."
 msgstr "Vyberte SVG ViewBox..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:65
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:66
 msgid "Extract best fitting boundary..."
 msgstr "Vyberte najvhodnejšie rozhranie(hranice)..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:126
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:127
 msgid "Create boundary"
 msgstr "Vytvorte rozhranie(hranice)"
@@ -8096,5 +8446,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 "Stiahnuť obrázok z francúzkeho Cadastre WMS"
 
@@ -8192,5 +8542,5 @@
 "Najskôr vyberte jednu z nich a potom zopakujte"
 
-#: ../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
@@ -8198,59 +8548,28 @@
 msgstr "Prázdna vrstva"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:176
 #, java-format
 msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr "WMS vrstva ({0}), {1} dlaždice(dlaždíc) načítané"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:183
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:178
 msgid "Is not vectorized."
 msgstr "Nie je vektorizované."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:179
 #, java-format
 msgid "Raster center: {0}"
 msgstr "Stred rastra: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181
 msgid "Is vectorized."
 msgstr "Je vektorizované."
 
-#: ../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 "Hranice obce bbox: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:282
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
-msgid "Save WMS layer to file"
-msgstr "Uložiť WMS vrstvu do súboru"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:287
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:295
-msgid "Save WMS layer"
-msgstr "Uložiť WMS vrstvu"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:309
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
-msgid "Load WMS layer from file"
-msgstr "Nahrať WMS vrstvu zo súboru"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:314
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:323
-msgid "Load WMS layer"
-msgstr "Načítať WMS vrstvu"
-
-#: ../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 "Nepodporovaná verzia WMS súboru; nájdené {0}, očakávané {1}"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:325
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:335
-msgid "File Format Error"
-msgstr "Chyba formátu súboru"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:481
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:401
 #, java-format
 msgid ""
@@ -8261,15 +8580,14 @@
 "Vytvorte nový súbor."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:482
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402
 msgid "Cache Format Error"
 msgstr "Cache chýb formátov"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:497
-#, java-format
-msgid "Lambert zone {0} in cache  incompatible with current Lambert zone {1}"
-msgstr ""
-"Lambert zóna {0} v cache je nekompatibilná s aktuálnou Lambert zónou {1}"
-
-#: ../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 "Cache chýb v Lambert Zóne"
@@ -8366,11 +8684,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 "Importovať cestu z GPX vrstvy"
 
 #: ../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 "Zahodiť existujúcu cestu"
@@ -8380,5 +8698,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 "GPS dátová vrstva nie je vytvorená."
@@ -8669,4 +8987,8 @@
 msgid "Lakewalker trace"
 msgstr "Lakewalker stopa(trace)"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:10
+msgid "An unknown error has occurred"
+msgstr ""
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
@@ -8989,42 +9311,42 @@
 msgstr "LiveGPS"
 
-#: ../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 "Namerané hodnoty"
 
-#: ../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 "Otvoriť okno merania."
 
-#: ../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 "Vynulovať (Reset)"
 
-#: ../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 "Vynulovať aktuálny nameraný výsledok a vymazať dráhu merania."
 
-#: ../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 "Dĺžka cesty"
 
-#: ../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 "Dĺžka výberu"
 
-#: ../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 "Plocha výberu"
 
-#: ../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 "Uhol"
 
-#: ../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 "Úhol medzi dvoma zvolenými bodmi"
 
-#: ../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 "Vrstva pre vykonávanie meraní"
@@ -9084,6 +9406,6 @@
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
-msgid "Open the OpenStreetBugs window and activate the automatic download"
-msgstr "Otvorí okno OpenStreetBugs a aktivuje automatické sťahovanie"
+msgid "Opens the OpenStreetBugs window and activates the automatic download"
+msgstr ""
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:123
@@ -9162,5 +9484,5 @@
 msgstr "Osmarender"
 
-#: ../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 "
@@ -9169,9 +9491,9 @@
 "Firefox sa nenašiel. Prosím nastavte spúšťací .exe súbor v nastaveniach."
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:123
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:127
 msgid "osmarender options"
 msgstr "možnosti pre osmarender"
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:124
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:128
 msgid "Firefox executable"
 msgstr "Spúšťací súbor Firefoxu"
@@ -9607,5 +9929,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 "Názov ulice"
@@ -9698,6 +10020,6 @@
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:195
-msgid "No intersections found. Nothing was changed."
-msgstr "Priesečník nie je najdený. Nič nebolo zmenené."
+msgid "No intersection found. Nothing was changed."
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:217
@@ -10585,41 +10907,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"
-"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"
-"Note: Make sure the image is suitable, copyright-wise, if in doubt, don't "
-"use."
-msgstr ""
-"Môžete pridať, upravovať a zmazať WMS položky v nastaveniach pre WMS plugin "
-"- zmeny sa prejavia aj vo WMS menu.\n"
-"\n"
-"Môžete zmeny urobiť aj ručne v hlavnom nastavení, použite nasledujúci "
-"náčrt:\n"
-"wmsplugin.url.1.name=Landsat\n"
-"wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n"
-"wmsplugin.url.2.name=NPE Maps... etc\n"
-"Úplný WMS URL vstupný formát napríklad (landsat)\n"
-"http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n"
-"layers=global_mosaic&styles=&srs=EPSG:4326&\n"
-"format=image/jpeg\n"
-"\n"
-"Pre Metacarta's Map Rectifier(prekresľovač http://labs.metacarta.com/"
-"rectifier/ , potrebujete iba príslušný 'id'.\n"
-"Pridať  Metacarta Map Rectifier položku v menu, ručne vytvoriť  URL ako v "
-"tomto príklade,nahradiť 73 s vašim id obrázka:\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"
-"Poznánka: Uistite sa či je možné obrázok použiť, pre autorské práva, ak máte "
-"pochybnosť, nepoužite ho."
-
-#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:54
+"Note: Make sure the image is suitable, copyright-wise, if in doubt, don't "
+"use."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:53
 msgid "WMS Plugin Help"
 msgstr "Nápoveda WMS Pluginu"
@@ -10678,5 +10977,5 @@
 msgstr "Nastavte polohu vybratej WMS vrstvy"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113
 #, java-format
 msgid ""
@@ -10723,4 +11022,29 @@
 msgid "Alpha channel"
 msgstr "Alfa kanál"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
+msgid "Save WMS layer to file"
+msgstr "Uložiť WMS vrstvu do súboru"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:295
+msgid "Save WMS layer"
+msgstr "Uložiť WMS vrstvu"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
+msgid "Load WMS layer from file"
+msgstr "Nahrať WMS vrstvu zo súboru"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:323
+msgid "Load WMS layer"
+msgstr "Načítať WMS vrstvu"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:334
+#, java-format
+msgid "Unsupported WMS file version; found {0}, expected {1}"
+msgstr "Nepodporovaná verzia WMS súboru; nájdené {0}, očakávané {1}"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:335
+msgid "File Format Error"
+msgstr "Chyba formátu súboru"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:163
@@ -10816,4 +11140,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 "Musíte urobiť vaše zmeny verejnými pre nahratie nových dát"
@@ -10830,5 +11159,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 "Špeciálny manipulant pre francúzsky WMS server pozemkového registra."
 
@@ -11154,5 +11483,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 "Odkaz"
@@ -11654,5 +11983,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 "Šírka (v metroch)"
@@ -12121,7 +12450,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 "Typ"
@@ -12737,10 +13066,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 "Operátor"
@@ -12953,7 +13282,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 "Nadmorská výška"
@@ -13892,5 +14221,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 "Poplatok"
@@ -14026,5 +14355,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 "Referencie (číslo stopy(track))"
@@ -14032,5 +14361,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 "Oblasť"
@@ -14082,11 +14411,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 "Prístrešok"
+
+#. item "Public Transport/Bus Stop" check "Shelter"
 #. </optional>
-#: build/trans_presets.java:1503
+#: build/trans_presets.java:1504
 msgid "Bus Platform"
 msgstr "Autobusové nástupište"
 
 #. item
-#: build/trans_presets.java:1504
+#: build/trans_presets.java:1505
 msgid "Edit Bus Platform"
 msgstr "Upraviť autobusové nástupište"
@@ -14094,5 +14433,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1512
+#: build/trans_presets.java:1513
 msgid "Taxi"
 msgstr "Taxi"
@@ -14100,5 +14439,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 "Upraviť stanicu taxíkov"
@@ -14106,5 +14445,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1519
+#: build/trans_presets.java:1520
 msgid "Airport"
 msgstr "Letisko"
@@ -14112,15 +14451,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 "Upraviť letisko"
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1526
+#: build/trans_presets.java:1527
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1527
+#: build/trans_presets.java:1528
 msgid "ICAO"
 msgstr "ICAO"
@@ -14129,5 +14468,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1532
+#: build/trans_presets.java:1533
 msgid "Accomodation"
 msgstr "Ubytovanie"
@@ -14139,5 +14478,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 "Hotel"
@@ -14146,15 +14485,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 "Upraviť hotel"
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1539
+#: build/trans_presets.java:1540
 msgid "Stars"
 msgstr "Hviezdičkový"
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1541
+#: build/trans_presets.java:1542
 msgid "Motel"
 msgstr "Motel"
@@ -14162,20 +14501,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 "Upraviť motel"
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1547
+#: build/trans_presets.java:1548
 msgid "Guest House"
 msgstr "Penzión"
 
 #. item
-#: build/trans_presets.java:1548
+#: build/trans_presets.java:1549
 msgid "Edit Guest House"
 msgstr "Upraviť penzión"
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1552
+#: build/trans_presets.java:1553
 msgid "Chalet"
 msgstr "Chata"
@@ -14183,10 +14522,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 "Upraviť chatu"
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1558
+#: build/trans_presets.java:1559
 msgid "Hostel"
 msgstr "Ubytovňa"
@@ -14194,30 +14533,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 "Upraviť ubytovňu"
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1564
+#: build/trans_presets.java:1565
 msgid "Alpine Hut"
 msgstr "Horská chata"
 
 #. item
-#: build/trans_presets.java:1565
+#: build/trans_presets.java:1566
 msgid "Edit Alpine Hut"
 msgstr "Upraviť horskú chatu"
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1570
+#: build/trans_presets.java:1571
 msgid "Caravan Site"
 msgstr "Kemping pre obytné prívesy"
 
 #. item
-#: build/trans_presets.java:1571
+#: build/trans_presets.java:1572
 msgid "Edit Caravan Site"
 msgstr "Upraviť kemping pre obytné prívesy"
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1575
+#: build/trans_presets.java:1576
 msgid "Camping Site"
 msgstr "Stanový tábor"
@@ -14225,10 +14564,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 "Upraviť stanový tábor"
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1582
+#: build/trans_presets.java:1583
 msgid "Food+Drinks"
 msgstr "Jedlo + Pitie"
@@ -14239,5 +14578,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 "Reštaurácia"
@@ -14245,5 +14584,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 "Upraviť reštauráciu"
@@ -14251,5 +14590,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 "Kuchyňa"
@@ -14257,61 +14596,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 "talianska"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "chinese"
 msgstr "čínska"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "burger"
 msgstr "hamburger"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "greek"
 msgstr "grécka"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "german"
 msgstr "nemecká"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "indian"
 msgstr "indická"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "regional"
 msgstr "regionálna"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "turkish"
 msgstr "turecká"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "asian"
 msgstr "ázijská"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "thai"
 msgstr "thajská"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "mexican"
 msgstr "mexická"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "japanese"
 msgstr "japonská"
 
-#: build/trans_presets.java:1590
+#: build/trans_presets.java:1591
 msgid "Fast Food"
 msgstr "Rýchle občerstvenie"
@@ -14319,9 +14658,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 "Upraviť reštauráciu rýchleho občerstvenia"
 
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1598
 msgid "Cafe"
 msgstr "Kaviareň"
@@ -14329,10 +14668,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 "Upraviť kaviareň"
 
 #. item "Food+Drinks/Cafe" text "Name"
-#: build/trans_presets.java:1603
+#: build/trans_presets.java:1604
 msgid "Pub"
 msgstr "Krčma"
@@ -14340,20 +14679,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 "Upraviť krčmu"
 
 #. item "Food+Drinks/Pub" text "Name"
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1610
 msgid "Biergarten"
 msgstr "Záhradná reštaurácia"
 
 #. item
-#: build/trans_presets.java:1610
+#: build/trans_presets.java:1611
 msgid "Edit Biergarten"
 msgstr "Upraviť záhradnú reštauráciu"
 
 #. item "Food+Drinks/Biergarten" text "Name"
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1615
 msgid "Bar"
 msgstr "Bar (výčap)"
@@ -14361,10 +14700,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 "Upraviť bar (výčap)"
 
 #. item "Food+Drinks/Bar" text "Name"
-#: build/trans_presets.java:1620
+#: build/trans_presets.java:1621
 msgid "Nightclub"
 msgstr "Nočný klub"
@@ -14372,20 +14711,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 "Upraviť nočný klub"
 
 #. item "Food+Drinks/Nightclub" text "Name"
-#: build/trans_presets.java:1627
+#: build/trans_presets.java:1628
 msgid "Tourism"
 msgstr "Turistika"
 
 #. group "Tourism"
-#: build/trans_presets.java:1628
+#: build/trans_presets.java:1629
 msgid "Attraction"
 msgstr "Atrakcia"
 
 #. item
-#: build/trans_presets.java:1629
+#: build/trans_presets.java:1630
 msgid "Edit Attraction"
 msgstr "Upraviť atrakciu"
@@ -14394,11 +14733,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 "Otváracia doba"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1634
+#: build/trans_presets.java:1635
 msgid "Museum"
 msgstr "Múzeum"
@@ -14406,10 +14745,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 "Upraviť múzeum"
 
 #. item "Tourism/Museum" text "Name"
-#: build/trans_presets.java:1640
+#: build/trans_presets.java:1641
 msgid "Zoo"
 msgstr "Zoo"
@@ -14418,10 +14757,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 "Upraviť zoo"
 
 #. item "Tourism/Zoo" text "Name"
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1648
 msgid "Viewpoint"
 msgstr "Výhliadka"
@@ -14429,25 +14768,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 "Upraviť výhliadku"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1652
+#: build/trans_presets.java:1653
 msgid "Look-Out Tower"
 msgstr "Výhliadková veža"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1654
+#: build/trans_presets.java:1655
 msgid "Theme Park"
 msgstr "Zábavný park"
 
 #. item
-#: build/trans_presets.java:1655
+#: build/trans_presets.java:1656
 msgid "Edit Theme Park"
 msgstr "Upraviť zábavný park"
 
 #. item "Tourism/Theme Park" text "Name"
-#: build/trans_presets.java:1659
+#: build/trans_presets.java:1660
 msgid "Artwork"
 msgstr "Umelecké dielo"
@@ -14455,5 +14794,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 "Upraviť umelecké dielo"
@@ -14461,5 +14800,5 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1667
 msgid "Information Office"
 msgstr "Informačná kancelária"
@@ -14467,83 +14806,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 "Upraviť informačnú kanceláriu"
 
+#. item "Tourism/Information Office" text "Opening Hours"
+#: build/trans_presets.java:1675
+msgid "Map"
+msgstr "Mapa"
+
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1679
 msgid "Map Type"
 msgstr "Typ mapy"
 
 #. item "Tourism/Map" combo "Map Type"
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1679
 msgid "map"
 msgstr "mapa"
 
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1679
 msgid "citymap"
 msgstr "mapa mesta"
 
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1679
 msgid "hikingmap"
 msgstr "turistická mapa"
 
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1679
 msgid "bicyclemap"
 msgstr "cykloturistická mapa"
 
 #. 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 "Bližší popis"
 
 #. item "Tourism/Map" text "Closer Description"
-#: build/trans_presets.java:1681
+#: build/trans_presets.java:1682
 msgid "Information Board"
 msgstr "Informačná tabuľa"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1686
 msgid "Board Type"
 msgstr "Typ tabuľe"
 
 #. item "Tourism/Information Board" combo "Board Type"
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1686
 msgid "board"
 msgstr "tabuľa"
 
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1686
 msgid "history"
 msgstr "história"
 
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1686
 msgid "nature"
 msgstr "príroda"
 
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1686
 msgid "wildlife"
 msgstr "divoká príroda"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1688
+#: build/trans_presets.java:1689
 msgid "Guidepost (Hiking)"
 msgstr "Informačné miesto (Turistika) (Guidepost (Hiking))"
 
 #. item "Tourism/Guidepost (Hiking)" text "Elevation"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1696
 msgid "Other Information Points"
 msgstr "Ostatné(iné) informačné body(miesta)"
 
-#. 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 "Prístrešok"
-
-#. item
-#: build/trans_presets.java:1703
+#. item
+#: build/trans_presets.java:1704
 msgid "Edit Shelter"
 msgstr "Upraviť prístrešok"
@@ -14551,25 +14887,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 "Ohnisko"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1709
 msgid "Picnic Site"
 msgstr "Výletné miesto"
 
 #. item
-#: build/trans_presets.java:1709
+#: build/trans_presets.java:1710
 msgid "Edit Picnic Site"
 msgstr "Upraviť výletné miesto"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1716
 msgid "Historic Places"
 msgstr "Historické miesta"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1716
+#: build/trans_presets.java:1717
 msgid "Castle"
 msgstr "Hrad"
@@ -14578,20 +14914,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 "Upraviť hrad"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1724
 msgid "Ruins"
 msgstr "Ruiny"
 
 #. item
-#: build/trans_presets.java:1724
+#: build/trans_presets.java:1725
 msgid "Edit Ruins"
 msgstr "Upraviť ruiny"
 
 #. item "Historic Places/Ruins" text "Name"
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1729
 msgid "Archaeological Site"
 msgstr "Archeologické nálezisko"
@@ -14600,10 +14936,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 "Upraviť archeologické nálezisko"
 
 #. item "Historic Places/Archaeological Site" text "Name"
-#: build/trans_presets.java:1735
+#: build/trans_presets.java:1736
 msgid "Battlefield"
 msgstr "Bojisko"
@@ -14611,5 +14947,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 "Upraviť bojisko"
@@ -14617,15 +14953,15 @@
 #. item "Historic Places/Battlefield" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1743
 msgid "Monument"
 msgstr "Pamätihodnosť, pamätník"
 
 #. item
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1744
 msgid "Edit Monument"
 msgstr "Upraviť pamätihodnosť, pamätník"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1748
 msgid "Memorial"
 msgstr "Pomník"
@@ -14633,45 +14969,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 "Upraviť pomník"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1753
+#: build/trans_presets.java:1754
 msgid "Wayside Cross"
 msgstr "Kríž pri ceste"
 
 #. item
-#: build/trans_presets.java:1754
+#: build/trans_presets.java:1755
 msgid "Edit Wayside Cross"
 msgstr "Upraviť kríž pri ceste"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1758
+#: build/trans_presets.java:1759
 msgid "Wayside Shrine"
 msgstr "Božia muka"
 
 #. item
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1760
 msgid "Edit Wayside Shrine"
 msgstr "Upraviť božiu muku"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1765
 msgid "Leisure"
 msgstr "Oddych (Leisure)"
 
 #. group "Leisure"
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1766
 msgid "Water Park"
 msgstr "Vodný zábavný park"
 
 #. item
-#: build/trans_presets.java:1766
+#: build/trans_presets.java:1767
 msgid "Edit Water Park"
 msgstr "Upraviť vodný zábavný park"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1770
+#: build/trans_presets.java:1771
 msgid "Playground"
 msgstr "Ihrisko"
@@ -14679,15 +15015,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 "Upraviť ihrisko"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1776
+#: build/trans_presets.java:1777
 msgid "Fishing"
 msgstr "Rybolov"
 
 #. item
-#: build/trans_presets.java:1777
+#: build/trans_presets.java:1778
 msgid "Edit Fishing"
 msgstr "Upraviť rybolov"
@@ -14695,15 +15031,15 @@
 #. item "Leisure/Fishing" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1783
+#: build/trans_presets.java:1784
 msgid "Sport Facilities"
 msgstr "Športové zariadenie"
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1784
+#: build/trans_presets.java:1785
 msgid "Stadium"
 msgstr "Štadión"
 
 #. item
-#: build/trans_presets.java:1785
+#: build/trans_presets.java:1786
 msgid "Edit Stadium"
 msgstr "Upraviť štadión"
@@ -14717,6 +15053,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 "vyberte šport:"
@@ -15092,6 +15428,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
@@ -15124,68 +15460,68 @@
 #. 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 "multi"
 
-#: 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 "lukostreľba"
 
-#: 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 "atletika"
 
-#: 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 "australian_football"
 
-#: 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 "bejzbal"
 
-#: 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 "basketbal"
 
-#: 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 "boules (spoločný názov pre hry hrajuce sa s kovovými guľami)"
 
-#: 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 ""
 "bowls (gúľanie šišatej gule po umelej,alebo prírodnej tráve k malej guľke)"
 
-#: 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 "kanoe"
 
-#: 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 "lezenie"
 
-#: 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 "kriket"
 
-#: 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 ""
 "kriketová tréningová plocha s ochrannými sieťami (pre pálkára a nadhadzovača)"
 
-#: 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 ""
@@ -15193,162 +15529,162 @@
 "trávnika)"
 
-#: 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 "bicyklovanie"
 
-#: 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 "závody chrtov"
 
-#: 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 "jazdectvo"
 
-#: 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 "americký futbal"
 
-#: 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 "golf"
 
-#: 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 "gymnastika"
 
-#: 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 "hokej"
 
-#: 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 "konské dostihy"
 
-#: 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 "automobilový"
 
-#: 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 "pelota"
 
-#: 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 "racquetbal (podobné ako squash, iné pravidlá)"
 
-#: 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 "ragby"
 
-#: 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 "streľba"
 
-#: 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 "skateboard"
 
-#: 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 "korčuľovanie"
 
-#: 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 "lyžovanie"
 
-#: 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 "futbal (soccer)"
 
-#: 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 "plávanie"
 
-#: 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 "stolný tenis"
 
-#: 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 "tenis"
 
-#: build/trans_presets.java:1793
+#: build/trans_presets.java:1794
 msgid "Sports Centre"
 msgstr "Športové centrum"
 
 #. item
-#: build/trans_presets.java:1794
+#: build/trans_presets.java:1795
 msgid "Edit Sports Centre"
 msgstr "Upraviť športové centrum"
 
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1803
 msgid "Pitch"
 msgstr "Hracia plocha, ihrisko"
 
 #. item
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1804
 msgid "Edit Pitch"
 msgstr "Upraviť hraciu plochu, ihrisko"
 
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1812
 msgid "Racetrack"
 msgstr "Dostihová dráha"
 
 #. item
-#: build/trans_presets.java:1812
+#: build/trans_presets.java:1813
 msgid "Edit Racetrack"
 msgstr "Upraviť dostihovú dráhu"
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1821
 msgid "Golf Course"
 msgstr "Golfové ihrisko"
 
 #. item
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1822
 msgid "Edit Golf Course"
 msgstr "Upraviť golfové ihrisko"
 
 #. item "Sport Facilities/Golf Course" text "Name"
-#: build/trans_presets.java:1825
+#: build/trans_presets.java:1826
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item
-#: build/trans_presets.java:1826
+#: build/trans_presets.java:1827
 msgid "Edit Miniature Golf"
 msgstr "Upraviť minigolf"
 
 #. item "Sport Facilities/Miniature Golf" text "Name"
-#: build/trans_presets.java:1831
+#: build/trans_presets.java:1832
 msgid "Sport"
 msgstr "Šport"
 
 #. group "Sport"
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1833
 msgid "Multi"
 msgstr "Multi"
 
 #. item
-#: build/trans_presets.java:1833
+#: build/trans_presets.java:1834
 msgid "Edit Multi"
 msgstr "Upraviť Multi"
@@ -15387,191 +15723,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 "hracia plocha, ihrisko"
 
-#: 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 "športové centrum"
 
-#: 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 "štadión"
 
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1839
 msgid "10pin"
 msgstr "10pin (Kolok na hru s desiatimi kolkami)"
 
 #. item
-#: build/trans_presets.java:1839
+#: build/trans_presets.java:1840
 msgid "Edit 10pin"
 msgstr "Upraviť 10pin (kolok na hru s desiatimi kolkami)"
 
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1845
 msgid "Athletics"
 msgstr "Atletika"
 
 #. item
-#: build/trans_presets.java:1845
+#: build/trans_presets.java:1846
 msgid "Edit Athletics"
 msgstr "Upraviť atletiku"
 
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1851
 msgid "Archery"
 msgstr "Lukostreľba"
 
 #. item
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:1852
 msgid "Edit Archery"
 msgstr "Upraviť lukostreľbu"
 
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:1857
 msgid "Climbing"
 msgstr "Lezenie"
 
 #. item
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:1858
 msgid "Edit Climbing"
 msgstr "Upraviť lezenie"
 
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1863
 msgid "Canoeing"
 msgstr "Kanoistika"
 
 #. item
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:1864
 msgid "Edit Canoeing"
 msgstr "Upraviť kanoistiku"
 
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:1869
 msgid "Cycling"
 msgstr "Cyklistika"
 
 #. item
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1870
 msgid "Edit Cycling"
 msgstr "Upraviť cyklistiku"
 
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1875
 msgid "Dog Racing"
 msgstr "Preteky chrtov"
 
 #. item
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1876
 msgid "Edit Dog Racing"
 msgstr "Upraviť preteky chrtov"
 
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1881
 msgid "Equestrian"
 msgstr "Jazdectvo"
 
 #. item
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:1882
 msgid "Edit Equestrian"
 msgstr "Upraviť jazdectvo"
 
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1887
 msgid "Horse Racing"
 msgstr "Konské dostihy"
 
 #. item
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1888
 msgid "Edit Horse Racing"
 msgstr "Upraviť konské dostihy"
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:1893
 msgid "Gymnastics"
 msgstr "Gymnastika"
 
 #. item
-#: build/trans_presets.java:1893
+#: build/trans_presets.java:1894
 msgid "Edit Gymnastics"
 msgstr "Upraviť turistiku"
 
-#: build/trans_presets.java:1898
+#: build/trans_presets.java:1899
 msgid "Motor Sports"
 msgstr "Motošport"
 
 #. item
-#: build/trans_presets.java:1899
+#: build/trans_presets.java:1900
 msgid "Edit Motor Sports"
 msgstr "Upraviť motošport"
 
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:1905
 msgid "Skating"
 msgstr "Korčuľovanie"
 
 #. item
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:1906
 msgid "Edit Skating"
 msgstr "Upraviť korčuľovanie"
 
-#: build/trans_presets.java:1910
+#: build/trans_presets.java:1911
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:1912
 msgid "Edit Skateboard"
 msgstr "Upraviť Skateboard"
 
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:1917
 msgid "Swimming"
 msgstr "Plávanie"
 
 #. item
-#: build/trans_presets.java:1917
+#: build/trans_presets.java:1918
 msgid "Edit Swimming"
 msgstr "Upraviť plávanie"
 
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:1923
 msgid "Skiing"
 msgstr "Lýžovanie"
@@ -15579,56 +15915,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 "Upraviť lyžovanie"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1928
 msgid "Piste type"
 msgstr "Typ lyžiarskej dráhy"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1928
 msgid "downhill"
 msgstr "zjazdárska"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1928
 msgid "nordic"
 msgstr "beh nalyžiach hore kopcom (nordic)"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1928
 msgid "snow_park"
 msgstr "park zimných športov"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:1929
 msgid "Difficulty"
 msgstr "Obtiažnosť"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:1929
 msgid "novice"
 msgstr "pre začiatočníkov"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:1929
 msgid "easy"
 msgstr "ľahká"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:1929
 msgid "intermediate"
 msgstr "stredne pokročilý (intermediate)"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:1929
 msgid "advanced"
 msgstr "pokročilý (advanced)"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:1929
 msgid "expert"
 msgstr "pre skúsených"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:1929
 msgid "freeride"
 msgstr "freeride (zjazd na horských bicykloch cez prekážky)"
 
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1932
 msgid "Shooting"
 msgstr "Streľba"
@@ -15636,178 +15972,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 "Upraviť streľbu"
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1940
 msgid "Sport (Ball)"
 msgstr "Šport (loptový)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1941
 msgid "Soccer"
 msgstr "Futbal"
 
 #. item
-#: build/trans_presets.java:1941
+#: build/trans_presets.java:1942
 msgid "Edit Soccer"
 msgstr "Upraviť futbal"
 
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:1947
 msgid "Football"
 msgstr "Americký futbal"
 
 #. item
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:1948
 msgid "Edit Football"
 msgstr "Upraviť americký futbal"
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1953
 msgid "Australian Football"
 msgstr "Australian Football"
 
 #. item
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:1954
 msgid "Edit Australian Football"
 msgstr "Upraviť Australian Football"
 
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:1959
 msgid "Baseball"
 msgstr "Bejzbal"
 
 #. item
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:1960
 msgid "Edit Baseball"
 msgstr "Upraviť bejzbal"
 
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:1965
 msgid "Basketball"
 msgstr "Basketbal"
 
 #. item
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:1966
 msgid "Edit Basketball"
 msgstr "Upraviť basketbal"
 
-#: 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 "Upraviť golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1975
 msgid "golf_course"
 msgstr "golfové ihrisko"
 
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:1977
 msgid "Boule"
 msgstr "Bowling na tráve"
 
 #. item
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:1978
 msgid "Edit Boule"
 msgstr "Upraviť bowling na tráve"
 
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:1983
 msgid "Bowls"
 msgstr "Bowling"
 
 #. item
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1984
 msgid "Edit Bowls"
 msgstr "Upraviť bowling"
 
-#: 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 "Upraviť kriket"
 
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:1995
 msgid "Cricket Nets"
 msgstr "Cvičné ihrisko pre kriket so sieťou"
 
 #. item
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:1996
 msgid "Edit Cricket Nets"
 msgstr "Upraviť cvičné ihrisko pre kriket so sieťou"
 
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:2001
 msgid "Croquet"
 msgstr "Croquet"
 
 #. item
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:2002
 msgid "Edit Croquet"
 msgstr "Upraviť kroquet"
 
-#: build/trans_presets.java:2006
+#: build/trans_presets.java:2007
 msgid "Hockey"
 msgstr "Hokej"
 
 #. item
-#: build/trans_presets.java:2007
+#: build/trans_presets.java:2008
 msgid "Edit Hockey"
 msgstr "Upraviť hokej"
 
-#: build/trans_presets.java:2012
+#: build/trans_presets.java:2013
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2014
 msgid "Edit Pelota"
 msgstr "Upraviť polotu"
 
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2019
 msgid "Racquet"
 msgstr "Racquetbal"
 
 #. item
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2020
 msgid "Edit Racquet"
 msgstr "Upraviť racquetbal"
 
-#: build/trans_presets.java:2024
+#: build/trans_presets.java:2025
 msgid "Rugby"
 msgstr "Ragby"
 
 #. item
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2026
 msgid "Edit Rugby"
 msgstr "Upraviť ragby"
 
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:2031
 msgid "Table Tennis"
 msgstr "Stolný tenis"
 
 #. item
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2032
 msgid "Edit Table Tennis"
 msgstr "Upraviť stolný tenis"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2037
 msgid "Tennis"
 msgstr "Tenis"
 
 #. item
-#: build/trans_presets.java:2037
+#: build/trans_presets.java:2038
 msgid "Edit Tennis"
 msgstr "Upraviť tenis"
 
 #. <separator/>
-#: build/trans_presets.java:2044
+#: build/trans_presets.java:2045
 msgid "Buildings"
 msgstr "Budovy, stavby"
 
 #. group "Buildings"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2046
 msgid "Building"
 msgstr "Budova"
@@ -15815,5 +16151,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2049
 msgid "Public Building"
 msgstr "Verejná budova"
@@ -15821,10 +16157,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 "Upraviť verejnú budovu"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2055
 msgid "Town hall"
 msgstr "Radnica (obecný úrad)"
@@ -15832,10 +16168,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 "Upraviť radnicu (obecný úrad)"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2061
 msgid "Embassy"
 msgstr "Veľvyslanectvo"
@@ -15843,10 +16179,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 "Upraviť veľvyslanectvo"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2066
+#: build/trans_presets.java:2067
 msgid "Courthouse"
 msgstr "Súd"
@@ -15855,10 +16191,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 "Upraviť súd"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2074
 msgid "Prison"
 msgstr "Vezenie"
@@ -15867,10 +16203,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 "Upraviť súd"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2080
+#: build/trans_presets.java:2081
 msgid "Police"
 msgstr "Polícia"
@@ -15880,10 +16216,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 "Upraviť políciu"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2089
 msgid "Fire Station"
 msgstr "Hasičská stanica"
@@ -15892,10 +16228,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 "Upraviť hasičskú stanicu"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2096
 msgid "Post Office"
 msgstr "Pošta"
@@ -15903,5 +16239,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 "Upraviť poštu"
@@ -15909,15 +16245,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2103
 msgid "Kindergarten"
 msgstr "Škôlka"
 
 #. item
-#: build/trans_presets.java:2103
+#: build/trans_presets.java:2104
 msgid "Edit Kindergarten"
 msgstr "Upraviť škôlku"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2108
 msgid "School"
 msgstr "Škola"
@@ -15925,10 +16261,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 "Upraviť školu"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2114
 msgid "University"
 msgstr "Univerzita"
@@ -15936,10 +16272,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 "Upraviť Univerzitu"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2120
 msgid "College"
 msgstr "Vysoká škola"
@@ -15947,5 +16283,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 "Upraviť vysokú školu"
@@ -15953,5 +16289,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2126
+#: build/trans_presets.java:2127
 msgid "Cinema"
 msgstr "Kino"
@@ -15960,10 +16296,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 "Upraviť kino"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2133
+#: build/trans_presets.java:2134
 msgid "Library"
 msgstr "Knižnica"
@@ -15972,10 +16308,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 "Upraviť knižnicu"
 
 #. item "Buildings/Library" text "Name"
-#: build/trans_presets.java:2140
+#: build/trans_presets.java:2141
 msgid "Arts Centre"
 msgstr "Kultúrne stredisko"
@@ -15983,10 +16319,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 "Upraviť kultúrne stredisko"
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2146
+#: build/trans_presets.java:2147
 msgid "Theatre"
 msgstr "Divadlo"
@@ -15995,10 +16331,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 "Upraviť divadlo"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2154
 msgid "Place of Worship"
 msgstr "Kostol"
@@ -16008,5 +16344,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 "Upraviť kostol"
@@ -16015,6 +16351,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 "Náboženstvo"
@@ -16023,66 +16359,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 "baháisti"
 
-#: 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 "budhisti"
 
-#: 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 "kresťania"
 
-#: 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 "hinduisti"
 
-#: 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 "džinisti"
 
-#: 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 "judaisti"
 
-#: 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 "moslimovia"
 
-#: 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 "spiritualisti"
 
-#: 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 "taoisti"
 
-#: 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 "unitársky"
 
-#: 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 "zoroastrian"
 
-#: 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 "Vyznanie (cirkevné)"
@@ -16091,81 +16427,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 "anglikánska"
 
-#: 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 "baptistická"
 
-#: 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 "katolícka"
 
-#: 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 "evanjelikánska"
 
-#: 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 "svedkovia jehovovi"
 
-#: 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 "lutheránska"
 
-#: 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 "methodistická"
 
-#: 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 "mormónska"
 
-#: 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 "orthodoxná"
 
-#: 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 "pentecostal"
 
-#: 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 "presbiteriánska"
 
-#: 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 "protestanská"
 
-#: 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 "quakerská"
 
-#: 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 "šiítska"
 
-#: 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 "sunnitská"
 
 #. <separator/>
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2165
 msgid "Addresses"
 msgstr "Adresy"
@@ -16174,5 +16510,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 "Upraviť informácie o adrese"
@@ -16180,5 +16516,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2169
+#: build/trans_presets.java:2170
 msgid "House number"
 msgstr "Číslo domu"
@@ -16186,20 +16522,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2172
 msgid "House name"
 msgstr "Meno domu"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2174
 msgid "City name"
 msgstr "Názov mesta"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2174
+#: build/trans_presets.java:2175
 msgid "Post code"
 msgstr "Poštové smerovacie číslo"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2176
 msgid "Country code"
 msgstr "Kód krajiny"
@@ -16207,5 +16543,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2179
 msgid "Address Interpolation"
 msgstr "Interpolácia adries"
@@ -16214,5 +16550,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 "Upraviť interpoláciu adries"
@@ -16220,71 +16556,71 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2184
 msgid "Numbering scheme"
 msgstr "Schéma číslovania"
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2184
 msgid "odd"
 msgstr "nepárne"
 
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2184
 msgid "even"
 msgstr "párne"
 
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2184
 msgid "all"
 msgstr "všetky"
 
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2184
 msgid "alphabetic"
 msgstr "abecedný"
 
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2187
 msgid "Man Made"
 msgstr "Človekom vytvorené (Man made)"
 
 #. group "Man Made"
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2188
 msgid "Works"
 msgstr "Závody (továrne)"
 
 #. item
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2189
 msgid "Edit Works"
 msgstr "Upraviť závody (továrne)"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2193
 msgid "Tower"
 msgstr "Veža"
 
 #. item
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2194
 msgid "Edit Tower"
 msgstr "Upraviť vežu"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2198
 msgid "Water Tower"
 msgstr "Vodojem"
 
 #. item
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2199
 msgid "Edit Water Tower"
 msgstr "Upraviť vodojem"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2203
 msgid "Gasometer"
 msgstr "Plynojem (Gasometer)"
 
 #. item
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2204
 msgid "Edit Gasometer"
 msgstr "Upraviť plynojem (gasometer)"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2207
+#: build/trans_presets.java:2208
 msgid "Lighthouse"
 msgstr "Maják"
@@ -16292,10 +16628,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 "Upraviť maják"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2214
 msgid "Windmill"
 msgstr "Veterný mlyn"
@@ -16303,10 +16639,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 "Upraviť veterný mlyn"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2220
 msgid "Pipeline"
 msgstr "Potrubie"
@@ -16314,10 +16650,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 "Upraviť potrubie"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2225
+#: build/trans_presets.java:2226
 msgid "Wastewater Plant"
 msgstr "Čistička odpadových vôd"
@@ -16327,10 +16663,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 "Upraviť čističku odpadových vôd"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2233
+#: build/trans_presets.java:2234
 msgid "Crane"
 msgstr "Žeriav"
@@ -16338,10 +16674,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 "Upraviť žeriav"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2239
+#: build/trans_presets.java:2240
 msgid "Beacon"
 msgstr "Signál (rádiomaják)"
@@ -16349,10 +16685,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 "Upraviť signál (rádiomaják)"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2245
+#: build/trans_presets.java:2246
 msgid "Survey Point"
 msgstr "Meračský bod"
@@ -16360,10 +16696,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 "Upraviť meračský bod"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2252
 msgid "Surveillance"
 msgstr "Pozorovanie (ostraha)"
@@ -16371,5 +16707,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 "Upraviť pozorovaciu kameru"
@@ -16377,5 +16713,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2258
+#: build/trans_presets.java:2259
 msgid "Power Generator"
 msgstr "Elektráreň (spôsob vyroby)"
@@ -16385,39 +16721,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 "Upraviť elektráreň (spôsob vyroby)"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "wind"
 msgstr "veterná"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "hydro"
 msgstr "vodná"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "fossil"
 msgstr "fosílna"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "nuclear"
 msgstr "jadrová"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "coal"
 msgstr "uhoľná"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "photovoltaic"
 msgstr "fotovoltanická (slnečná články)"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "gas"
 msgstr "plynová"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2268
 msgid "Power Station"
 msgstr "Transformátorová stanica"
@@ -16426,10 +16762,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 "Upraviť trafostanicu"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2274
+#: build/trans_presets.java:2275
 msgid "Power Sub Station"
 msgstr "Malý transformátor"
@@ -16438,5 +16774,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 "Upraviť malý transformátor"
@@ -16444,10 +16780,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 "Odkazová linka"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2282
+#: build/trans_presets.java:2283
 msgid "Power Tower"
 msgstr "Elektrický stožiar (vysoké napätie)"
@@ -16458,5 +16794,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 "Upraviť elektrický stožiar"
@@ -16464,5 +16800,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 "Elektrické vedenie"
@@ -16471,25 +16807,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 "Upraviť elektrické vedenie"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2298
 msgid "Voltage"
 msgstr "Napätie"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2299
 msgid "Amount of Wires"
 msgstr "Počet vodičov"
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2301
+#: build/trans_presets.java:2302
 msgid "Amenities"
 msgstr "Vybavenosť (Amenities)"
 
 #. group "Amenities"
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2303
 msgid "Toilets"
 msgstr "Toalety"
@@ -16497,20 +16833,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 "Referenčné číslo"
 
 #. 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 "Poznámka"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2312
 msgid "Post Box"
 msgstr "Poštová schránka"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2317
 msgid "Telephone"
 msgstr "Telefón"
@@ -16519,5 +16855,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 "Upraviť telefón"
@@ -16525,5 +16861,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 "Mince"
@@ -16531,5 +16867,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 "Bankovky"
@@ -16537,5 +16873,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 "Platobné karty a Kreditné karty"
@@ -16543,5 +16879,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 "Debetné karty"
@@ -16549,15 +16885,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 "Kreditné karty"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2328
 msgid "Telephone cards"
 msgstr "Telefónne karty"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2330
 msgid "Recycling"
 msgstr "Recyklácia"
@@ -16566,5 +16902,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 "Upraviť recykláciu (zber)"
@@ -16572,35 +16908,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 "Batérie"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2336
 msgid "Cans"
 msgstr "Plechovky"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2337
 msgid "Clothes"
 msgstr "Handry"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2338
 msgid "Glass"
 msgstr "Sklo"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2339
 msgid "Paper"
 msgstr "Papier"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2340
 msgid "Scrap Metal"
 msgstr "Železný šrot"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2342
 msgid "Bench"
 msgstr "Lavička"
@@ -16609,20 +16945,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 "Poľovnícky posed"
 
 #. item
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2347
 msgid "Edit Hunting Stand"
 msgstr "Upraviť poľovnícky posed"
 
 #. item "Amenities/Hunting Stand" check "Shelter"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2350
 msgid "Hide"
 msgstr "Skryť"
 
 #. item "Amenities/Hunting Stand" check "Hide"
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2351
 msgid "Lock"
 msgstr "Zamknúť"
@@ -16630,22 +16966,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 "Výška"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2351
+#: build/trans_presets.java:2352
 msgid "low"
 msgstr "nízky"
 
-#: build/trans_presets.java:2351
+#: build/trans_presets.java:2352
 msgid "half"
 msgstr "polovičný"
 
-#: build/trans_presets.java:2351
+#: build/trans_presets.java:2352
 msgid "full"
 msgstr "úplný"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2354
 msgid "Fountain"
 msgstr "Fontána"
@@ -16654,10 +16990,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 "Upraviť fontánu"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2361
 msgid "Drinking Water"
 msgstr "Pitná voda"
@@ -16666,10 +17002,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 "Upraviť pitnú vodu"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2367
+#: build/trans_presets.java:2368
 msgid "Baby Hatch"
 msgstr "Hniezdo záchrany"
@@ -16677,25 +17013,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 "Upraviť hniezdo záchrany"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2375
+#: build/trans_presets.java:2376
 msgid "Shops"
 msgstr "Obchody"
 
 #. 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 "Upraviť supermarket"
 
 #. item "Shops/Supermarket" text "Name"
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:2382
 msgid "Convenience Store"
 msgstr "Obchod s polotovarmi"
@@ -16703,10 +17039,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 "Upraviť obchod s polotovarmi"
 
 #. item "Shops/Convenience Store" text "Name"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2388
 msgid "Kiosk"
 msgstr "Stánok"
@@ -16714,10 +17050,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 "Upraviť stánok"
 
 #. item "Shops/Kiosk" text "Name"
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2394
 msgid "Vending machine"
 msgstr "Predajný automat"
@@ -16725,5 +17061,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 "Upraviť predajný automat"
@@ -16731,88 +17067,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 "Predávané výrobky"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "public_transport_tickets"
 msgstr "lístky MHD"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "public_transport_plans"
 msgstr "plány MHD"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "parking_tickets"
 msgstr "parkovacie lístky"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "food"
 msgstr "jedlo"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "drinks"
 msgstr "pitie"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "sweets"
 msgstr "sladkosti"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "cigarettes"
 msgstr "cigarety"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "photos"
 msgstr "fotky"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "animal_food"
 msgstr "krmivo pre zvieratá"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "news_papers"
 msgstr "noviny"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "toys"
 msgstr "hračky"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "stamps"
 msgstr "známky"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "SIM-cards"
 msgstr "SIM-karty"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "telephone_vouchers"
 msgstr "telefónne kupóny (poukážky)"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "vouchers"
 msgstr "kupóny (poukážky)"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "condoms"
 msgstr "kondómy"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "tampons"
 msgstr "tampóny"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "excrement_bags"
 msgstr "sáčky na výkaly"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2407
 msgid "Account or loyalty cards"
 msgstr "Prístupové alebo vernostné karty"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2408
+#: build/trans_presets.java:2409
 msgid "Butcher"
 msgstr "Mäsiareň"
@@ -16820,10 +17156,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 "Upraviť mäsiarstvo"
 
 #. item "Shops/Butcher" text "Name"
-#: build/trans_presets.java:2414
+#: build/trans_presets.java:2415
 msgid "Baker"
 msgstr "Chlieb a pečivo"
@@ -16831,10 +17167,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 "Upraviť chlieb a pečivo"
 
 #. item "Shops/Baker" text "Name"
-#: build/trans_presets.java:2420
+#: build/trans_presets.java:2421
 msgid "Florist"
 msgstr "Kvetinárstvo"
@@ -16842,20 +17178,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 "Upraviť kvetinárstvo"
 
 #. item "Shops/Florist" text "Name"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2427
 msgid "Organic"
 msgstr "Biopotraviny"
 
 #. item
-#: build/trans_presets.java:2427
+#: build/trans_presets.java:2428
 msgid "Edit Organic Shop"
 msgstr "Upraviť biopotraviny"
 
 #. item "Shops/Organic" text "Name"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2432
 msgid "Alcohol"
 msgstr "Alkohol"
@@ -16863,60 +17199,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 "Upraviť Obchod s alkoholickými nápojmi"
 
 #. item "Shops/Alcohol" text "Name"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2438
 msgid "Beverages"
 msgstr "Nápoje"
 
 #. item
-#: build/trans_presets.java:2438
+#: build/trans_presets.java:2439
 msgid "Edit Beverages Shop"
 msgstr "Upraviť Obchod s nápojmi."
 
 #. item "Shops/Beverages" text "Name"
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:2443
 msgid "Computer"
 msgstr "Počítač"
 
 #. item
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2444
 msgid "Edit Computer Shop"
 msgstr "Upraviť počítačový obchod"
 
 #. item "Shops/Computer" text "Name"
-#: build/trans_presets.java:2447
+#: build/trans_presets.java:2448
 msgid "Electronics"
 msgstr "Elektronika"
 
 #. item
-#: build/trans_presets.java:2448
+#: build/trans_presets.java:2449
 msgid "Edit Electronics Shop"
 msgstr "Upraviť obchod s elektronikou"
 
 #. item "Shops/Electronics" text "Name"
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2453
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2454
 msgid "Edit Hifi Shop"
 msgstr "Upraviť obchod s Hifi elektronikou"
 
 #. item "Shops/Hifi" text "Name"
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2458
 msgid "Furniture"
 msgstr "Nábytok"
 
 #. item
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2459
 msgid "Edit Furniture Shop"
 msgstr "Upraviť obchod s nábytkom"
 
 #. item "Shops/Furniture" text "Name"
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2463
 msgid "Garden Centre"
 msgstr "Záhradné centrum"
@@ -16924,10 +17260,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 "Upraviť záhradné centrum"
 
 #. item "Shops/Garden Centre" text "Name"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2469
 msgid "Hardware"
 msgstr "Železiarstvo"
@@ -16935,10 +17271,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 "Upraviť železiarstvo"
 
 #. item "Shops/Hardware" text "Name"
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2475
 msgid "Do-it-yourself-store"
 msgstr "Obchod Urob si sám"
@@ -16946,60 +17282,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 "Upraviť obchod Urob si sám"
 
 #. item "Shops/Do-it-yourself-store" text "Name"
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2481
 msgid "Stationery"
 msgstr "Papierníctvo"
 
 #. item
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2482
 msgid "Edit Stationery Shop"
 msgstr "Upraviť papierníctvo"
 
 #. item "Shops/Stationery" text "Name"
-#: build/trans_presets.java:2485
+#: build/trans_presets.java:2486
 msgid "Hairdresser"
 msgstr "Kaderníctvo"
 
 #. item
-#: build/trans_presets.java:2486
+#: build/trans_presets.java:2487
 msgid "Edit Hairdresser"
 msgstr "Upraviť kaderníctvo"
 
 #. item "Shops/Hairdresser" text "Name"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2491
 msgid "Shoes"
 msgstr "Obuva"
 
 #. item
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2492
 msgid "Edit Shoe Shop"
 msgstr "Upravit obchod s obuvou"
 
 #. item "Shops/Shoes" text "Name"
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2496
 msgid "Toys"
 msgstr "Hračky"
 
 #. item
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2497
 msgid "Edit Toy Shop"
 msgstr "Upraviť obchod s hračkami"
 
 #. item "Shops/Toys" text "Name"
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2501
 msgid "Video"
 msgstr "Obchod s DVD"
 
 #. item
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2502
 msgid "Edit Video Shop"
 msgstr "Upraviť obchod s DVD"
 
 #. item "Shops/Video" text "Name"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2506
 msgid "Dry Cleaning"
 msgstr "Chemická čistiareň"
@@ -17007,10 +17343,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 "Upraviť chemickú čistiareň"
 
 #. item "Shops/Dry Cleaning" text "Name"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2512
 msgid "Laundry"
 msgstr "Práčovňa"
@@ -17018,10 +17354,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 "Upraviť práčovňu"
 
 #. item "Shops/Laundry" text "Name"
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2518
 msgid "Outdoor"
 msgstr "Turistický (Outdoor)"
@@ -17029,35 +17365,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 "Upraviť obchod s výchádzkovým (outdoor) tovarom"
 
 #. item "Shops/Outdoor" text "Name"
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2524
 msgid "Sports"
 msgstr "Športy"
 
 #. item
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2525
 msgid "Edit Sports Shop"
 msgstr "Upraviť športový obchod"
 
 #. 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 "Upraviť očnú optiku"
 
 #. item "Shops/Optician" text "Name"
-#: build/trans_presets.java:2535
+#: build/trans_presets.java:2536
 msgid "Cash"
 msgstr "Hotovosť"
 
 #. group "Cash"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2537
 msgid "Bank"
 msgstr "Banka"
@@ -17065,5 +17401,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 "Upraviť banku"
@@ -17071,10 +17407,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 "Bankomat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2544
 msgid "Money Exchange"
 msgstr "Zmenáreň"
@@ -17082,5 +17418,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 "Upraviť zmenáreň"
@@ -17088,15 +17424,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 "Upraviť bankomat"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2557
 msgid "Health"
 msgstr "Zdravie"
 
 #. group "Health"
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2558
 msgid "Doctors"
 msgstr "Lekári"
@@ -17104,20 +17440,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 "Upraviť lekárov"
 
 #. item "Health/Doctors" text "Name"
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2564
 msgid "Dentist"
 msgstr "Zubný lekár"
 
 #. item
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2565
 msgid "Edit Dentist"
 msgstr "Upraviť zubného lekára"
 
 #. item "Health/Dentist" text "Name"
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2569
 msgid "Pharmacy"
 msgstr "Lekáreň"
@@ -17125,5 +17461,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 "Upraviť lekáreň"
@@ -17131,10 +17467,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 "výdaj na recepty"
 
 #. item "Health/Pharmacy" text "Name"
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2576
 msgid "Hospital"
 msgstr "Nemocnica"
@@ -17142,10 +17478,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 "Upraviť nemocnicu"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2582
 msgid "Emergency Access Point"
 msgstr "Pohotovosť (Záchranná služba)"
@@ -17154,5 +17490,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 "Upraviť pohotovosť (záchrannú službu)"
@@ -17161,20 +17497,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2588
 msgid "Point Number"
 msgstr "Číslo bodu"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2589
 msgid "Point Name"
 msgstr "Meno bodu(miesta)"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2591
 msgid "Phone Number"
 msgstr "Telefónne číslo"
 
 #. 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 "(Použite medzinárodný kód, ako +12-345-67890)"
@@ -17182,5 +17518,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 "Veterinár"
@@ -17189,25 +17525,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 "Upraviť veterinárnu ambulanciu"
 
 #. 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 "Upraviť kontinent"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2611
 msgid "Country"
 msgstr "Krajina (štát)"
 
 #. item
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2612
 msgid "Edit Country"
 msgstr "Upraviť krajinu (štát)"
@@ -17215,30 +17551,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 "Stav"
 
 #. item
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2618
 msgid "Edit State"
 msgstr "Upraviť štát"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2622
+#: build/trans_presets.java:2623
 msgid "Region"
 msgstr "Oblasť (región)"
 
 #. item
-#: build/trans_presets.java:2623
+#: build/trans_presets.java:2624
 msgid "Edit Region"
 msgstr "Upraviť oblasť (región)"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2628
+#: build/trans_presets.java:2629
 msgid "County"
 msgstr "kraj (okres)"
 
 #. item
-#: build/trans_presets.java:2629
+#: build/trans_presets.java:2630
 msgid "Edit County"
 msgstr "Upraviť kraj (okres)"
@@ -17246,15 +17582,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2635
+#: build/trans_presets.java:2636
 msgid "City"
 msgstr "Mesto (city)"
 
 #. item
-#: build/trans_presets.java:2636
+#: build/trans_presets.java:2637
 msgid "Edit City"
 msgstr "Upraviť mesto"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2641
+#: build/trans_presets.java:2642
 msgid "Town"
 msgstr "Mesto (town)"
@@ -17262,10 +17598,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 "Upraviť mesto"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2649
 msgid "Suburb"
 msgstr "Štvrť"
@@ -17273,25 +17609,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 "Upraviť štvrť"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2656
 msgid "Village"
 msgstr "Dedina"
 
 #. item
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2657
 msgid "Edit Village"
 msgstr "Upraviť dedinu"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2662
 msgid "Hamlet"
 msgstr "Malá dedina / osada / samota"
 
 #. item
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2663
 msgid "Edit Hamlet"
 msgstr "Upraviť malú dedinu"
@@ -17299,5 +17635,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2669
 msgid "Locality"
 msgstr "Oblasť (lokalita)"
@@ -17305,10 +17641,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 "Upraviť oblasť (lokalitu)"
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2676
 msgid "Island"
 msgstr "Ostrov"
@@ -17316,5 +17652,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 "Upraviť Ostrov"
@@ -17322,5 +17658,5 @@
 #. item "Places/Island" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2683
+#: build/trans_presets.java:2684
 msgid "Cave Entrance"
 msgstr "Vstup do jaskyne"
@@ -17328,10 +17664,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 "Upraviť vstup do jaskyne"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2690
 msgid "Peak"
 msgstr "Vrchol"
@@ -17339,10 +17675,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 "Upraviť vrchol kopca"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2697
 msgid "Glacier"
 msgstr "Ľadovec"
@@ -17350,10 +17686,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 "Upraviť ľadovec"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2703
+#: build/trans_presets.java:2704
 msgid "Volcano"
 msgstr "Sopka"
@@ -17361,70 +17697,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 "Upraviť sopku"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2711
+#: build/trans_presets.java:2712
 msgid "Boundaries"
 msgstr "Hranice"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2713
 msgid "National"
 msgstr "Štátna"
 
 #. item
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2714
 msgid "Edit National Boundary"
 msgstr "Upraviť štátne hranice"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2718
+#: build/trans_presets.java:2719
 msgid "Administrative"
 msgstr "Administratívne"
 
 #. item
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2720
 msgid "Edit Administrative Boundary"
 msgstr "Upraviť administratívne hranice"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2724
+#: build/trans_presets.java:2725
 msgid "Civil"
 msgstr "Občianske"
 
 #. item
-#: build/trans_presets.java:2725
+#: build/trans_presets.java:2726
 msgid "Edit Civil Boundary"
 msgstr "Upraviť občiansku hranicu"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2730
+#: build/trans_presets.java:2731
 msgid "Political"
 msgstr "Politická"
 
 #. item
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:2732
 msgid "Edit Political Boundary"
 msgstr "Upraviť politickú hranicu"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2736
+#: build/trans_presets.java:2737
 msgid "National park"
 msgstr "Národný park"
 
 #. item
-#: build/trans_presets.java:2737
+#: build/trans_presets.java:2738
 msgid "Edit National Park Boundary"
 msgstr "Upraviť hranicu Národného parku (prírodnej rezervácie)"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2744
 msgid "Land use"
 msgstr "Využívanie oblasti (Land use)"
 
 #. group "Land use"
-#: build/trans_presets.java:2744
+#: build/trans_presets.java:2745
 msgid "Tree"
 msgstr "Strom"
@@ -17433,15 +17769,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 "Upraviť strom"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2753
 msgid "Botanical Name"
 msgstr "Botanický názov"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2755
 msgid "Wood"
 msgstr "Drevo"
@@ -17450,5 +17786,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 "Upraviť Drevo"
@@ -17456,17 +17792,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 "ihličnatý"
 
-#: build/trans_presets.java:2760 build/trans_presets.java:2769
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
 msgid "deciduous"
 msgstr "listnatý"
 
-#: build/trans_presets.java:2760 build/trans_presets.java:2769
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
 msgid "mixed"
 msgstr "zmiešaný"
 
-#: build/trans_presets.java:2762
+#: build/trans_presets.java:2763
 msgid "Forest"
 msgstr "Les"
@@ -17475,14 +17811,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 "Upraviť les"
 
-#: build/trans_presets.java:2771
+#: build/trans_presets.java:2772
 msgid "Nature Reserve"
 msgstr "Prírodná rezervácia"
 
 #. item
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2773
 msgid "Edit Nature Reserve"
 msgstr "Upraviť prírodnú rezerváciu"
@@ -17490,25 +17826,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2777
+#: build/trans_presets.java:2778
 msgid "Scree"
 msgstr "Sutina"
 
 #. item
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:2779
 msgid "Edit Scree"
 msgstr "Upraviť sutinu"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2783
 msgid "Scrub"
 msgstr "Krovie"
 
 #. item
-#: build/trans_presets.java:2783
+#: build/trans_presets.java:2784
 msgid "Edit Scrub"
 msgstr "Upraviť krovie"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2788
 msgid "Fell"
 msgstr "Fell (typ horskej krajiny nad pásmom stromov (horská pastvina))"
@@ -17516,5 +17852,5 @@
 #. 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 ""
@@ -17522,5 +17858,5 @@
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2794
 msgid "Heath"
 msgstr "Vresovisko"
@@ -17528,5 +17864,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 "Upraviť vresovisko"
@@ -17534,5 +17870,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2801
 msgid "Farmyard"
 msgstr "Farma"
@@ -17541,45 +17877,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 "Upraviť farmu"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2808
+#: build/trans_presets.java:2809
 msgid "Farmland"
 msgstr "Poľnohospodárska pôda"
 
 #. item
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2810
 msgid "Edit Farmland Landuse"
 msgstr "Upraviť poľnohospodárske pôdu"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2814
+#: build/trans_presets.java:2815
 msgid "Meadow"
 msgstr "Lúka"
 
 #. item
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2816
 msgid "Edit Meadow Landuse"
 msgstr "Upraviť lúku"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2820
+#: build/trans_presets.java:2821
 msgid "Vineyard"
 msgstr "Vinica"
 
 #. item
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2822
 msgid "Edit Vineyard Landuse"
 msgstr "Upraviť vinicu"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2826
+#: build/trans_presets.java:2827
 msgid "Allotments"
 msgstr "Ťažobný priestor"
 
 #. item
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:2828
 msgid "Edit Allotments Landuse"
 msgstr "Upraviť ťažobný priestor"
@@ -17587,25 +17923,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2833
+#: build/trans_presets.java:2834
 msgid "Garden"
 msgstr "Záhrada"
 
 #. item
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2835
 msgid "Edit Garden"
 msgstr "Upraviť záhradu"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2838
+#: build/trans_presets.java:2839
 msgid "Grass"
 msgstr "Tráva"
 
 #. item
-#: build/trans_presets.java:2839
+#: build/trans_presets.java:2840
 msgid "Edit Grass Landuse"
 msgstr "Upraviť trávnatú plochu"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2845
 msgid "Village Green"
 msgstr "Obecná zeleň"
@@ -17613,10 +17949,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 "Upraviť obecnú zeleň"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:2852
 msgid "Common"
 msgstr "Spoločné, obecné"
@@ -17624,20 +17960,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 "Upraviť spoločné, obecné"
 
 #. 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 "Upraviť park"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2863
 msgid "Recreation Ground"
 msgstr "Rekreačná oblasť"
@@ -17645,5 +17981,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 "Upraviť rekreačnú oblasť"
@@ -17651,15 +17987,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2871
 msgid "Residential area"
 msgstr "Osídlená oblasť (Residential area)"
 
 #. item
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2872
 msgid "Edit Residential Landuse"
 msgstr "Upraviť osídlenú oblasť"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2877
 msgid "Graveyard"
 msgstr "Cintorín (malý, blizko kostola)"
@@ -17667,9 +18003,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 "Upraviť cintorín (malý, blizko kostola)"
 
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:2885
 msgid "Cemetery"
 msgstr "Cintorín"
@@ -17677,39 +18013,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 "Upraviť cintorín"
 
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2894
 msgid "Retail"
 msgstr "Maloobchod"
 
 #. item
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2895
 msgid "Edit Retail Landuse"
 msgstr "Upraviť oblasť s maloobchodmi"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2900
 msgid "Commercial"
 msgstr "Obchodná (komerčná)"
 
 #. item
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2901
 msgid "Edit Commercial Landuse"
 msgstr "Upraviť obchodnú (komerčnú) oblasť"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2906
 msgid "Industrial"
 msgstr "Priemysel"
 
 #. item
-#: build/trans_presets.java:2906
+#: build/trans_presets.java:2907
 msgid "Edit Industrial Landuse"
 msgstr "Upraviť priemyselnú oblasť"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2912
 msgid "Railway land"
 msgstr "Železničný pozemok"
@@ -17717,15 +18053,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 "Upraviť železničný pozemok"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:2919
 msgid "Military"
 msgstr "Armáda"
 
 #. item
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2920
 msgid "Edit Military Landuse"
 msgstr "Upraviť vojenskú oblasť"
@@ -17733,55 +18069,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2925
+#: build/trans_presets.java:2926
 msgid "Construction area"
 msgstr "Stavebná oblasť"
 
 #. item
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2927
 msgid "Edit Construction Landuse"
 msgstr "Upraviť stavebnú oblasť"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2932
 msgid "Brownfield"
 msgstr "Brownfield (opustený priemyselný objekt)"
 
 #. item
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:2933
 msgid "Edit Brownfield Landuse"
 msgstr "Upraviť brownfield (opustený priemyselný objekt)"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2937
+#: build/trans_presets.java:2938
 msgid "Greenfield"
 msgstr "Greenfield (oblasť používaná pre poľnohospodárstvo)"
 
 #. item
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:2939
 msgid "Edit Greenfield Landuse"
 msgstr "Upraviť greenfield (oblasť používaná pre poľnohospodárstvo)"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:2944
 msgid "Landfill"
 msgstr "Skládka odpadov"
 
 #. item
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:2945
 msgid "Edit Landfill Landuse"
 msgstr "Upraviť skládku odpadov"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2950
 msgid "Quarry"
 msgstr "Lom"
 
 #. item
-#: build/trans_presets.java:2950
+#: build/trans_presets.java:2951
 msgid "Edit Quarry Landuse"
 msgstr "Upraviť lom"
 
 #. group "Relations"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2960
 msgid "Multipolygon"
 msgstr "multipolygón"
@@ -17791,5 +18127,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 "Upraviť multipolygón"
@@ -17798,10 +18134,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:2970
 msgid "outer segment"
 msgstr "obvodová časť (outer segment)"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:2970
+#: build/trans_presets.java:2971
 msgid "inner segment"
 msgstr "vnútorná časť (inner segment)"
@@ -17809,5 +18145,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:2974
 msgid "Turn restriction"
 msgstr "Prikázané smery jazdy (turn restriction)"
@@ -17816,5 +18152,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 "Upraviť prikázané smery jazdy (turn restriction)"
@@ -17822,34 +18158,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 "Obmedzenie"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_left_turn"
 msgstr "zákaz zabočenia vľavo"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_right_turn"
 msgstr "zákaz zabočenia vpravo"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_straight_on"
 msgstr "zákaz jazdy priamo"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_u_turn"
 msgstr "zákaz otáčania sa"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "only_right_turn"
 msgstr "prikázané odbočenie vpravo"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "only_left_turn"
 msgstr "prikázané odbočenie vľavo"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "only_straight_on"
 msgstr "zákaz odbočenia"
@@ -17858,15 +18194,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2983
+#: build/trans_presets.java:2984
 msgid "from way"
 msgstr "z cesty"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2985
 msgid "via node or way"
 msgstr "cez bod alebo cestu"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2986
 msgid "to way"
 msgstr "k ceste"
@@ -17874,5 +18210,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:2988
+#: build/trans_presets.java:2989
 msgid "Route"
 msgstr "Cesta (Route)"
@@ -17881,5 +18217,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 "Upraviť Cestu (Route)"
@@ -17887,5 +18223,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 "Typ Cesty (Route)"
@@ -17957,5 +18293,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
@@ -17964,17 +18300,17 @@
 msgstr "bicykel"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "bus"
 msgstr "autobus"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "road"
 msgstr "cesta (vozovka)"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "ferry"
 msgstr "trajekt (prievoz)"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "ski"
 msgstr "lyžovanie"
@@ -18027,5 +18363,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
@@ -18034,13 +18370,13 @@
 msgstr "pešia (foot)"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "hiking"
 msgstr "turistika"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "tram"
 msgstr "električka"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "detour"
 msgstr "obchádzka"
@@ -18054,10 +18390,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 "metro (subway)"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:2997
 msgid "Symbol description"
 msgstr "Popis značky"
@@ -18065,26 +18401,26 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:2999
+#: build/trans_presets.java:3000
 msgid "Network"
 msgstr "Sieť"
 
 #. item "Relations/Route" combo "State"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "proposed"
 msgstr "plánovaný"
 
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "alternate"
 msgstr "náhradný"
 
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "temporary"
 msgstr "dočasný"
 
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "connection"
 msgstr "spojenie"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3003
 msgid "Color (hex)"
 msgstr "Farba (hex)"
@@ -18093,30 +18429,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:3006
 msgid "route segment"
 msgstr "cestný úsek"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3007
 msgid "forward segment"
 msgstr "predný segment"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3008
 msgid "backward segment"
 msgstr "zadný segment"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3009
 msgid "halt point"
 msgstr "bod prerušenia"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3010
 msgid "forward halt point"
 msgstr "predný bod prerušenia"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3011
 msgid "backward halt point"
 msgstr "zadný bod prerušenia"
@@ -22231,7 +22567,20 @@
 msgstr "Terraserver Urban"
 
+#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
+#~ msgstr ""
+#~ "Môžete použiť koliesko myši alebo Ctrl+Šípky pre zväčšenie, alebo  posun"
+
 #~ msgid "Uploading data"
 #~ msgstr "Nahrávam dáta"
 
+#~ msgid "Email"
+#~ msgstr "E-mail"
+
+#~ msgid "Login name (email) to the OSM account."
+#~ msgstr "Prihlasovacie meno (email) k OSM účtu."
+
+#~ msgid "OSM username (email)"
+#~ msgstr "OSM používateľské meno (email)"
+
 #~ msgid "Unknown host"
 #~ msgstr "Neznámy hostiteľ"
@@ -22239,4 +22588,11 @@
 #~ msgid "Add either site-josm.xml or Wiki Pages."
 #~ msgstr "Vložte buď site-josm.xml alebo wiki stránku"
+
+#~ msgid ""
+#~ "Server returned internal error. Try a reduced area or retry after waiting "
+#~ "some time."
+#~ msgstr ""
+#~ "Server vrátil vnútornú chybu. Skúste to za chvíľu znovu alebo skúste "
+#~ "zmenšiť oblasť."
 
 #~ msgid "Commit comment"
@@ -22295,6 +22651,63 @@
 #~ msgstr "Naozaj označiť tento problém ako \"hotový\"?"
 
+#~ 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 URL.<br><b>Do not use a valuable Password.</b></html>"
+#~ msgstr ""
+#~ "<html>Upozornenie: Heslo je uložené v nešifrovanej podobe v konfiguračnom "
+#~ "súbore.<br>Heslo sa prenáša v nešifrovanej podobe v URL na server."
+#~ "<br><b>Nepoužívajte dôležité heslo.</b></html>"
+
 #~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS"
 #~ msgstr "Sťahovať Prekreslený Obrázok z Metacarta's Map Rectifier WMS"
+
+#~ msgid ""
+#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab "
+#~ "- these will then show up in the WMS menu.\n"
+#~ "\n"
+#~ "You can also do this manually in the Advanced Preferences, using the "
+#~ "following schema:\n"
+#~ "wmsplugin.url.1.name=Landsat\n"
+#~ "wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n"
+#~ "wmsplugin.url.2.name=NPE Maps... etc\n"
+#~ "\n"
+#~ "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"
+#~ "\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"
+#~ "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"
+#~ "Note: Make sure the image is suitable, copyright-wise, if in doubt, don't "
+#~ "use."
+#~ msgstr ""
+#~ "Môžete pridať, upravovať a zmazať WMS položky v nastaveniach pre WMS "
+#~ "plugin - zmeny sa prejavia aj vo WMS menu.\n"
+#~ "\n"
+#~ "Môžete zmeny urobiť aj ručne v hlavnom nastavení, použite nasledujúci "
+#~ "náčrt:\n"
+#~ "wmsplugin.url.1.name=Landsat\n"
+#~ "wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n"
+#~ "wmsplugin.url.2.name=NPE Maps... etc\n"
+#~ "Úplný WMS URL vstupný formát napríklad (landsat)\n"
+#~ "http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n"
+#~ "layers=global_mosaic&styles=&srs=EPSG:4326&\n"
+#~ "format=image/jpeg\n"
+#~ "\n"
+#~ "Pre Metacarta's Map Rectifier(prekresľovač http://labs.metacarta.com/"
+#~ "rectifier/ , potrebujete iba príslušný 'id'.\n"
+#~ "Pridať  Metacarta Map Rectifier položku v menu, ručne vytvoriť  URL ako v "
+#~ "tomto príklade,nahradiť 73 s vašim id obrázka:\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"
+#~ "Poznánka: Uistite sa či je možné obrázok použiť, pre autorské práva, ak "
+#~ "máte pochybnosť, nepoužite ho."
 
 #~ msgid "Portcullis"
@@ -22322,10 +22735,38 @@
 #~ msgstr "viadukt (nadjazd)"
 
+#~ msgid "Open the OpenStreetBugs window and activate the automatic download"
+#~ msgstr "Otvorí okno OpenStreetBugs a aktivuje automatické sťahovanie"
+
 #~ msgid "sports"
 #~ msgstr "Športový"
 
+#~ msgid ""
+#~ "Lambert zone {0} in cache  incompatible with current Lambert zone {1}"
+#~ msgstr ""
+#~ "Lambert zóna {0} v cache je nekompatibilná s aktuálnou Lambert zónou {1}"
+
 #~ msgid "Delete and Download"
 #~ msgstr "Vymazať a Nahrať"
 
+#~ msgid "No intersections found. Nothing was changed."
+#~ msgstr "Priesečník nie je najdený. Nič nebolo zmenené."
+
+#~ msgid ""
+#~ "This action will require {0} individual download requests. Do you wish to "
+#~ "continue?"
+#~ msgstr ""
+#~ "Táto činnosť vyžaduje {0} individuálne požiadavky na stiahnutie. Prajete "
+#~ "si pokračovať?"
+
+#~ msgid ""
+#~ "An error occured while trying to match the photos to the GPX track. You "
+#~ "can adjust the sliders to manually match the photos."
+#~ msgstr ""
+#~ "Stala sa nejaká chyba, pri skúške či sa hodia fotky ku GPX stope. Môžete "
+#~ "nastaviť posúvatko na manuálne priradenie fotiek."
+
+#~ msgid "The following errors occured during mass download:"
+#~ msgstr "V priebehu sťahovania nastala nasledujúca chyba :"
+
 #~ msgid "Edit Drawbridge"
 #~ msgstr "Upraviť padací most"
@@ -22333,4 +22774,15 @@
 #~ msgid "Edit Portcullis"
 #~ msgstr "Upraviť mreže"
+
+#~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">english</A>."
+#~ msgstr ""
+#~ "Stránka s nápovedou chýba. Vytvorte to v <A HREF=\"{0}\">english</A>."
+
+#~ msgid ""
+#~ "Helppage missing. Create it in <A HREF=\"{0}\">english</A> or <A HREF="
+#~ "\"{1}\">your language</A>."
+#~ msgstr ""
+#~ "Stránka s nápovedou chýba. Vytvorte to v <A HREF=\"{0}\">english</A> "
+#~ "alebo <A HREF=\"{1}\">váš jazyk</A>."
 
 #~ msgid ""
@@ -22355,4 +22807,10 @@
 #~ msgstr "Nie je inicializované"
 
+#~ msgid "Cannot read numeric value from response"
+#~ msgstr "Nemôžem čítať číselné hodnoty z odpovede"
+
 #~ msgid "Data upload failed for unknown reason"
 #~ msgstr "Chyba pri nahrávaní z neznámeho dôvodu"
+
+#~ msgid "Resolve conflicts in member list of of relation {0}"
+#~ msgstr "Vyriešte rozpor v poradovom čísle relácie {0}"
Index: applications/editors/josm/i18n/po/sl.po
===================================================================
--- applications/editors/josm/i18n/po/sl.po	(revision 16008)
+++ applications/editors/josm/i18n/po/sl.po	(revision 16009)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-14 16:51+0200\n"
-"PO-Revision-Date: 2009-06-09 18:38+0000\n"
+"POT-Creation-Date: 2009-06-19 21:52+0200\n"
+"PO-Revision-Date: 2009-06-14 17:32+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -17,5 +17,5 @@
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
 "%100==4 ? 3 : 0);\n"
-"X-Launchpad-Export-Date: 2009-06-14 14:46+0000\n"
+"X-Launchpad-Export-Date: 2009-06-19 19:35+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -28,11 +28,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 "Pomoč"
 
 #: ../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 ""
 
@@ -73,6 +73,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
@@ -89,8 +91,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
@@ -139,5 +141,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-pošta"
+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,5 +704,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:207
 #, java-format
-msgid "Helppage missing. Create it in <A HREF=\"{0}\">english</A>."
+msgid "Help page missing. Create it in <A HREF=\"{0}\">english</A>."
 msgstr ""
 
@@ -706,5 +710,5 @@
 #, 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 ""
@@ -1123,13 +1127,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:99
 msgid "Status Report"
 msgstr "Poročilo stanja"
 
-#: ../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 "Kopiraj na odložišče in zapri"
 
-#: ../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
@@ -1314,102 +1318,272 @@
 msgstr ""
 
-#: ../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 "Posodobitev podatkov"
 
-#: ../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 "Posodobitev trenutne podatkovne plasti (ponoven sprejem s strežnika)"
 
-#: ../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?"
 msgstr ""
 
-#: ../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 ""
-
-#: ../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 "Pošlji v OSM ..."
 
-#: ../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 "Pošlji vse spremembe na strežnik OSM."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:96
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:94
 msgid "Objects to add:"
 msgstr "Novi predmeti:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102
 msgid "Objects to modify:"
 msgstr "Spremenjeni predmeti:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:110
 msgid "Objects to delete:"
 msgstr "Izbrisani predmeti:"
 
-#: ../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 "Vpišite kratek opis sprememb, ki jih pošiljate:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:126
 msgid "Upload these changes?"
 msgstr "Pošljem te spremembe?"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:130
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
 msgid "Upload Changes"
 msgstr ""
 
-#: ../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 "Ni česa poslati. Najprej pridobite kakšne podatke."
 
-#: ../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 "Obstajajo nerazrešeni konflikti. Razrešite jih."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:182
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:180
 msgid "No changes to upload."
 msgstr "Ni sprememb za pošiljanje."
 
-#: ../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 ""
@@ -1514,36 +1688,50 @@
 msgstr "Surovi podatki GPS"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:44
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:46
 msgid "Downloading data"
 msgstr "Sprejem podatkov"
 
-#: ../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 "Nič podatkov ni bilo uvoženih."
 
-#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:83
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:88
 msgid "OpenStreetMap data"
 msgstr "Podatki OpenStreetMap"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:37
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:45
 msgid "Data Layer"
 msgstr "Podatkovna plast"
 
-#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:88
-msgid "The following errors occured during mass download:"
-msgstr ""
-
-#: ../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 ""
+
+#: ../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 ""
 
@@ -1595,34 +1783,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 "Dodaj vozlišče"
 
-#: ../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 "Dodaj vozlišče v pot"
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:500
+msgid "Connect existing way to node"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:502
-msgid "Connect existing way to node"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:504
 msgid "Add a new node to an existing way"
 msgstr "Dodaj novo vozlišče v pot"
 
-#: ../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 "Dodaj in poveži vozlišče v pot"
 
-#: ../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 ""
 
+#: ../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 ""
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:888
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:910
-msgid "Select node under cursor."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890
 #, java-format
 msgid "Insert new node into way."
@@ -1631,14 +1819,14 @@
 msgstr[1] ""
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:897
+msgid "Start new way from last node."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:899
-msgid "Start new way from last node."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:901
 msgid "Continue way from last node."
 msgstr ""
 
-#: ../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 ""
@@ -1949,26 +2137,32 @@
 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 "Naloži izbrano"
 
-#: ../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 "Kontaktiraj {0}..."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:45
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:46
 msgid "Downloading..."
 msgstr "Sprejemanje..."
 
-#: ../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 "Ni mogoče brati z naslova: \"{0}\""
 
-#: ../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 "Napaka pri razločevanju na naslovu: \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:74
+msgid "Error while communicating with server."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67
@@ -2031,13 +2225,80 @@
 msgstr "Razreši {0} sporov v {1} predmetih"
 
-#: ../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 "Izbriši {1} {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97
+#, java-format
+msgid "Delete {0} {1}"
+msgstr "Izbriši {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153
+msgid "Conflicting relation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147
+#, java-format
+msgid ""
+"Selection \"{0}\" is used by relation \"{1}\" with role {2}.\n"
+"Delete from relation?"
+msgstr ""
+"Izbrani predmet \"{0}\" je vključen v relacijo \"{1}\" z vlogo {2}.\n"
+"Izbrišem iz relacije?"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570
+msgid "Delete from relation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
+#, java-format
+msgid ""
+"Selection \"{0}\" is used by relation \"{1}\".\n"
+"Delete from relation?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:366
+msgid "Split way segment"
+msgstr ""
+
+#. leave message in one tr() as there is a grammatical connection.
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:385
+msgid ""
+"You are about to delete nodes outside of the area you have downloaded."
+"<br>This can cause problems because other objects (that you don't see) might "
+"use them.<br>Do you really want to delete?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:53
+#, java-format
+msgid "Resolve conflicts in deleted state in {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118
+msgid "Move"
+msgstr "Premakni"
+
 #: ../core/src/org/openstreetmap/josm/command/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"
@@ -2048,10 +2309,217 @@
 msgstr[3] "vozlišča"
 
-#: ../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 "Zasuk"
+
+#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88
+msgid "Sequence"
+msgstr "Zaporedje"
+
+#: ../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 "Uveljavim?"
+
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:141
+msgid ""
+"When reversing this way, the following changes to properties of the way and "
+"its nodes are suggested in order to maintain data consistency."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28
+msgid "Relation"
+msgstr "Relacija"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30
+msgid "Old role"
+msgstr "Stara vloga"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:32
+msgid "New role"
+msgstr "Nova vloga"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
+msgid "Old key"
+msgstr "Star ključ"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
+msgid "Old value"
+msgstr "Stara vrednost"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
+msgid "New key"
+msgstr "Nov ključ"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
+msgid "New value"
+msgstr "Nova vrednost"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:40
+msgid "Apply selected changes"
+msgstr "Uveljavi izbrane spremembe"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41
+msgid "Don't apply changes"
+msgstr "Ne uveljavi sprememb"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:83
+msgid "Please select which property changes you want to apply."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:96
+msgid "Properties of "
+msgstr "Lastnosti "
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:120
+msgid "Roles in relations referring to"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:136
+msgid "Automatic tag correction"
+msgstr "Samodejno popravljanje oznak"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:314
+#, java-format
+msgid "Malformed config file at lines {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:324
+#, java-format
+msgid "Cannot open preferences directory: {0}"
+msgstr "Ni možno odpreti imenika z nastavitvami: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:342
+#, java-format
+msgid "Preferences file had errors. Making backup of old one to {0}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:79
+#, java-format
+msgid "Preferences stored on {0}"
+msgstr "Nastavitve shranjene na {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:82
+#, java-format
+msgid "Could not upload preferences. Reason: {0}"
+msgstr "Nastavitev ni bilo mogoče prenesti. Razlog: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:93
+msgid "Could not load preferences from server."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:34
+msgid "different"
+msgstr "različno"
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:262
+msgid "deleted"
+msgstr "izbrisano"
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
+msgid "true"
+msgstr "pravilno"
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
+msgid "false"
+msgstr "napačno"
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20
+msgid "position"
+msgstr "položaj"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30
+msgid "Decimal Degrees"
+msgstr "Decimalne stopinje"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
+msgid "Degrees Minutes Seconds"
+msgstr "Stopinje Minute Sekunde"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+msgid "S"
+msgstr "J"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+msgid "N"
+msgstr "S"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+msgid "W"
+msgstr "Z"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+msgid "E"
+msgstr "V"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/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 "nepopoln"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
+#, java-format
+msgid "Error: {0}"
+msgstr "Napaka: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
+#, java-format
+msgid "Warning: {0}"
+msgstr "Opozorilo: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/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"
@@ -2062,8 +2530,10 @@
 msgstr[3] "poti"
 
-#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:46
-#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:62
-#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:49
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:87
+#: ../core/src/org/openstreetmap/josm/data/osm/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
@@ -2076,258 +2546,27 @@
 msgstr[3] "relacije"
 
-#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:68
-#, java-format
-msgid "Resolve conflicts in coordinates in {0}"
-msgstr ""
-
-#. should not happen
-#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:88
-#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:73
-msgid "cannot resolve undecided conflict"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81
-#, java-format
-msgid "Delete {1} {0}"
-msgstr "Izbriši {1} {0}"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97
-#, java-format
-msgid "Delete {0} {1}"
-msgstr "Izbriši {0} {1}"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153
-msgid "Conflicting relation"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147
-#, java-format
-msgid ""
-"Selection \"{0}\" is used by relation \"{1}\" with role {2}.\n"
-"Delete from relation?"
-msgstr ""
-"Izbrani predmet \"{0}\" je vključen v relacijo \"{1}\" z vlogo {2}.\n"
-"Izbrišem iz relacije?"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570
-msgid "Delete from relation"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
-#, java-format
-msgid ""
-"Selection \"{0}\" is used by relation \"{1}\".\n"
-"Delete from relation?"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:366
-msgid "Split way segment"
-msgstr ""
-
-#. leave message in one tr() as there is a grammatical connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:385
-msgid ""
-"You are about to delete nodes outside of the area you have downloaded."
-"<br>This can cause problems because other objects (that you don't see) might "
-"use them.<br>Do you really want to delete?"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:53
-#, java-format
-msgid "Resolve conflicts in deleted state in {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118
-msgid "Move"
-msgstr "Premakni"
-
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:52
-#, java-format
-msgid "Resolve conflicts in member list of of relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66
-msgid "RemoveRelationMember"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
-msgid "Rotate"
-msgstr "Zasuk"
-
-#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88
-msgid "Sequence"
-msgstr "Zaporedje"
-
-#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:84
-#, java-format
-msgid "Resolve {0} tag conflicts in {1} {2}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:57
-#, java-format
-msgid "Resolve version conflicts for {0} {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52
-#, java-format
-msgid "Resolve conflicts in node list of of way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
-msgid "Apply?"
-msgstr "Uveljavim?"
-
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:141
-msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28
-msgid "Relation"
-msgstr "Relacija"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30
-msgid "Old role"
-msgstr "Stara vloga"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:32
-msgid "New role"
-msgstr "Nova vloga"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
-msgid "Old key"
-msgstr "Star ključ"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
-msgid "Old value"
-msgstr "Stara vrednost"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
-msgid "New key"
-msgstr "Nov ključ"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
-msgid "New value"
-msgstr "Nova vrednost"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:40
-msgid "Apply selected changes"
-msgstr "Uveljavi izbrane spremembe"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41
-msgid "Don't apply changes"
-msgstr "Ne uveljavi sprememb"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:83
-msgid "Please select which property changes you want to apply."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:96
-msgid "Properties of "
-msgstr "Lastnosti "
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:120
-msgid "Roles in relations referring to"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:136
-msgid "Automatic tag correction"
-msgstr "Samodejno popravljanje oznak"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:314
-#, java-format
-msgid "Malformed config file at lines {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:324
-#, java-format
-msgid "Cannot open preferences directory: {0}"
-msgstr "Ni možno odpreti imenika z nastavitvami: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:342
-#, java-format
-msgid "Preferences file had errors. Making backup of old one to {0}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:79
-#, java-format
-msgid "Preferences stored on {0}"
-msgstr "Nastavitve shranjene na {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:82
-#, java-format
-msgid "Could not upload preferences. Reason: {0}"
-msgstr "Nastavitev ni bilo mogoče prenesti. Razlog: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:93
-msgid "Could not load preferences from server."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:34
-msgid "different"
-msgstr "različno"
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:262
-msgid "deleted"
-msgstr "izbrisano"
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
-msgid "true"
-msgstr "pravilno"
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
-msgid "false"
-msgstr "napačno"
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20
-msgid "position"
-msgstr "položaj"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30
-msgid "Decimal Degrees"
-msgstr "Decimalne stopinje"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
-msgid "Degrees Minutes Seconds"
-msgstr "Stopinje Minute Sekunde"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
-msgid "S"
-msgstr "J"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
-msgid "N"
-msgstr "S"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
-msgid "W"
-msgstr "Z"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
-msgid "E"
-msgstr "V"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:108
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:83
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:115
-msgid "incomplete"
-msgstr "nepopoln"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
-#, java-format
-msgid "Error: {0}"
-msgstr "Napaka: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
-#, java-format
-msgid "Warning: {0}"
-msgstr "Opozorilo: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:101
+#: ../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"
@@ -2343,5 +2582,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:122
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "railway"
 msgstr "železnica"
@@ -2365,4 +2604,62 @@
 msgstr[3] "{0} točke"
 
+#: ../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."
@@ -2510,5 +2807,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 "ozadje"
@@ -2581,8 +2878,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
@@ -2594,7 +2891,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
@@ -2697,10 +2994,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 "Uporabniško ime"
 
 #: ../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 "Geslo"
@@ -2794,22 +3091,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:146
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148
 msgid "File"
 msgstr "Datoteka"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150
 msgid "View"
 msgstr "Pogled"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:149
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151
 msgid "Tools"
 msgstr "Orodja"
 
-#: ../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 "Prednastavitve"
 
-#: ../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
@@ -2822,21 +3119,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 ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:218
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221
 msgid "Toggle Wireframe view"
 msgstr ""
 
-#: ../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 "Zvok"
@@ -2908,6 +3205,6 @@
 msgstr "(ni predmeta)"
 
-#: ../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 "plasti ni na seznamu."
@@ -2917,9 +3214,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:104
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:105
 msgid "Error while parsing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:107
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:108
 msgid "File not found"
 msgstr "Datoteke ni mogoče najti"
@@ -2991,5 +3288,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 "Člani"
@@ -3185,5 +3482,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
@@ -3265,5 +3562,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 ""
@@ -3302,5 +3599,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 ""
 
@@ -3354,5 +3651,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 "Vloga"
@@ -3456,5 +3753,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
@@ -3767,5 +4064,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 "Relacije"
@@ -3870,66 +4167,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 "Osnovno"
 
-#: ../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 "Član"
 
-#: ../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 ""
 
-#: ../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 "Pomakni izbranega člana vrstico višje."
 
-#: ../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 "Dodaj izbrano"
 
-#: ../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 "Dodaj kot člane vse trenutno izbrane predmete"
 
-#: ../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 "Odstrani izbrano"
 
-#: ../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 ""
 
-#: ../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 "Pomakni izbranega člana vrstico nižje."
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "Sprejmi vse nepopolne poti in vozlišča v relaciji"
@@ -3974,5 +4271,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
@@ -3993,9 +4290,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 "da"
 
-#: ../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
@@ -4017,30 +4314,33 @@
 #: 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 "Člani: {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 ""
 
-#: ../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 ""
 
-#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:562
+msgid "Error when communicating with server."
 msgstr ""
 
@@ -4106,17 +4406,17 @@
 msgstr "Viri in vrste podatkov"
 
-#: ../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 "Sprejmi kot novo plast"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:174
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:173
 msgid "Download Area"
 msgstr "Sprejmi področje"
 
-#: ../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 "Področje za sprejem je preveliko; najbrž bo strežnik zahtevo zavrnil"
 
-#: ../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 ""
@@ -4145,5 +4445,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 "Kraji"
@@ -4190,21 +4490,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 "vrsta"
@@ -4244,15 +4544,4 @@
 msgid "Tile Numbers"
 msgstr "Številke ploščic"
-
-#: ../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 ""
-"Za premikanje in povečavo lahko uporabite miško ali <ctrl>+<smerne tipke>."
-
-#. 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 "Zemljevid"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:98
@@ -4333,5 +4622,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)"
@@ -4447,14 +4736,14 @@
 msgstr "Zvočne datoteke (*.wav)"
 
-#: ../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 "Uvozi slike"
 
-#: ../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, "
@@ -4463,5 +4752,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, "
@@ -4470,5 +4759,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"
@@ -4477,28 +4766,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 "Opis: {0}"
 
-#: ../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 "Pretvori v podatkovno plast"
 
-#: ../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 ""
@@ -4507,11 +4796,11 @@
 msgstr ""
 
-#: ../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
@@ -4521,29 +4810,29 @@
 msgstr ""
 
-#: ../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 "Sprejmi iz OSM vzdolž te sledi"
 
-#: ../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 "Sprejmi vse znotraj:"
 
-#: ../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 ""
@@ -4554,9 +4843,9 @@
 "nadaljevati?</html>"
 
-#: ../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 "
@@ -4564,5 +4853,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 "
@@ -4570,33 +4859,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 "izven sprejetega področja"
 
-#: ../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 "{0} je sestavljen iz:"
 
-#: ../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} izbrisan.)"
 
-#: ../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"
@@ -4604,21 +4902,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"
@@ -4768,5 +5066,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
@@ -4775,5 +5073,5 @@
 msgstr "Prosim izberite vrstico za urejanje."
 
-#: ../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
@@ -4781,5 +5079,5 @@
 msgstr "Nova vrednost za {0}"
 
-#: ../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
@@ -4789,5 +5087,5 @@
 msgstr "Prosim izberite vrstico za izbris."
 
-#: ../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 "Vpišite nov par ključ/vrednost"
@@ -5664,106 +5962,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 "Naziv"
@@ -6229,6 +6527,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:36
-msgid "Login name (email) to the OSM account."
-msgstr "Uporabniško ime (email) vašega računa pri OSM."
+msgid "Login name (e-mail) to the OSM account."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
@@ -6242,6 +6540,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
-msgid "OSM username (email)"
-msgstr "OSM uporabniško ime (email)"
+msgid "OSM username (e-mail)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
@@ -6252,10 +6550,7 @@
 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 ""
-"<html>POZOR: Geslo je shranjeno v datoteki z nastavitvami v obliki navadnega "
-"besedila.<br>Geslo se na strežnik prenaša nekriptirano v naslovu URL."
-"<br><b>Ne uporabljaj gesla enakega nekeu drugemu pomembnemu geslu.</b></html>"
 
 #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on
@@ -6549,6 +6844,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 ""
@@ -6559,7 +6855,7 @@
 msgstr "Sprejem točk od {0} do {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 "Sprejemanje podatkov OSM..."
@@ -6624,15 +6920,14 @@
 msgstr ""
 
-#: ../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 ""
@@ -6641,31 +6936,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 ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:351
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298
 msgid "Closing changeset..."
 msgstr ""
 
-#: ../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 "Pripravljanje..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:381
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:326
 msgid "Uploading..."
 msgstr "Pošiljanje ..."
@@ -6680,25 +6981,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 "Napačno uporabniško ime ali geslo."
 
-#: ../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 "Pozor: Geslo se prenaša nekriptirano"
 
-#: ../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 "Shrani uporabniško ime in geslo (nekriptirano)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:89
 msgid "Enter Password"
 msgstr "Vnesite geslo"
 
-#: ../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..."
@@ -6709,4 +7010,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."
@@ -6799,9 +7143,23 @@
 msgstr "Neveljaven id točke"
 
-#: ../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 "Vzpostavljanje povezave s strežnikom..."
 
-#: ../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."
@@ -6810,15 +7168,9 @@
 "internetom."
 
-#: ../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 ""
-
-#: ../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 ""
 
@@ -6834,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 ""
@@ -7022,9 +7374,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 "Sprejem manjkajočih vstavkov"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:128
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:119
 #, java-format
 msgid ""
@@ -7037,6 +7389,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
@@ -7059,35 +7411,35 @@
 msgstr "neznan"
 
-#: ../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}: Različica {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 ""
 
-#: ../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 "Napaka pri branju datoteke s podatki o vstavkih: {0}"
 
-#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:329
+#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:340
 msgid "Error playing sound"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
 msgid "Do nothing"
 msgstr "Ne stori ničesar"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
 msgid "Report Bug"
 msgstr "Prijavi napako"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:52
 msgid ""
 "An unexpected exception occurred.\n"
@@ -7101,18 +7453,18 @@
 "urejevalnika JOSM, vas prosimo, da prijavite napako (podrobno, v angleščini)."
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55
 msgid "Unexpected Exception"
 msgstr "Nepričakovana napaka"
 
-#: ../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 "Prosimo, prijavite težavo na {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 "Napišite (čim bolj) točne korake kako ponoviti napako!"
 
-#: ../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 "
@@ -7121,9 +7473,9 @@
 "Preden prijavite napako poskusite posodobiti JOSM na najnovejšo različico."
 
-#: ../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 "Prijava napake naj vsebuje vsaj naslednje informacije:"
 
-#: ../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 "(besedilo je že bilo prekopirano na odložišče.)"
@@ -7200,5 +7552,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 "Opis"
@@ -7565,5 +7917,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 ""
@@ -7597,5 +7949,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"
@@ -7618,5 +7969,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
@@ -7707,6 +8058,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/"
@@ -7782,6 +8133,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
@@ -7789,11 +8140,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 ""
@@ -7810,13 +8161,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 ""
@@ -7837,5 +8188,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 ""
 
@@ -7928,5 +8279,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
@@ -7934,59 +8285,28 @@
 msgstr "Prazna plast"
 
+#: ../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 "Shrani plast WMS v datoteko"
-
-#: ../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 "Naloži plast WMS iz datoteke"
-
-#: ../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 "Nepodprta različica datoteke WMS; našel {0}, pričakoval {1}"
-
-#: ../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 ""
@@ -7995,14 +8315,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 ""
@@ -8097,11 +8417,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 ""
@@ -8111,5 +8431,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 ""
@@ -8396,4 +8716,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 ""
 
@@ -8707,42 +9031,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 "Izmerjene vrednosti"
 
-#: ../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 "Odpri okno za merjenje"
 
-#: ../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 "Dolžina poti"
 
-#: ../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 "Dolžina izbranih poti"
 
-#: ../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 "Izbrana površina"
 
-#: ../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 "Kot"
 
-#: ../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 "Kot med dvema izbranima vozliščema"
 
-#: ../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 ""
@@ -8799,5 +9123,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 ""
 
@@ -8873,5 +9197,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 "
@@ -8879,9 +9203,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 ""
@@ -9308,5 +9632,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 "Ime ceste"
@@ -9396,5 +9720,5 @@
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:195
-msgid "No intersections found. Nothing was changed."
+msgid "No intersection found. Nothing was changed."
 msgstr ""
 
@@ -10257,19 +10581,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 "Pomoč vstavka WMS"
@@ -10328,5 +10651,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113
 #, java-format
 msgid ""
@@ -10368,4 +10691,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 "Shrani plast WMS v datoteko"
+
+#: ../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 "Naloži plast WMS iz datoteke"
+
+#: ../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 "Nepodprta različica datoteke WMS; našel {0}, pričakoval {1}"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:335
+msgid "File Format Error"
 msgstr ""
 
@@ -10457,4 +10805,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 ""
@@ -10469,5 +10822,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 ""
 
@@ -10751,5 +11104,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 ""
@@ -11251,5 +11604,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 ""
@@ -11718,7 +12071,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 "Vrsta"
@@ -12334,10 +12687,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 ""
@@ -12549,7 +12902,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 ""
@@ -13481,5 +13834,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 ""
@@ -13615,5 +13968,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 ""
@@ -13621,5 +13974,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 ""
@@ -13671,11 +14024,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 "Avtobusni peron"
 
 #. item
-#: build/trans_presets.java:1504
+#: build/trans_presets.java:1505
 msgid "Edit Bus Platform"
 msgstr "Uredi avtobusni peron"
@@ -13683,5 +14046,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1512
+#: build/trans_presets.java:1513
 msgid "Taxi"
 msgstr "Taksi"
@@ -13689,5 +14052,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 "Uredi postajališče taksijev"
@@ -13695,5 +14058,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1519
+#: build/trans_presets.java:1520
 msgid "Airport"
 msgstr "Letališče"
@@ -13701,15 +14064,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 ""
@@ -13718,5 +14081,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1532
+#: build/trans_presets.java:1533
 msgid "Accomodation"
 msgstr "Nastanitev"
@@ -13728,5 +14091,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 ""
@@ -13735,15 +14098,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 ""
@@ -13751,20 +14114,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 ""
@@ -13772,10 +14135,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 ""
@@ -13783,30 +14146,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 ""
@@ -13814,10 +14177,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 "Hrana in pijača"
@@ -13828,5 +14191,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 ""
@@ -13834,5 +14197,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 ""
@@ -13840,5 +14203,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 ""
@@ -13846,61 +14209,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 ""
@@ -13908,9 +14271,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 ""
@@ -13918,10 +14281,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 "Pivnica"
@@ -13929,20 +14292,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 "Uredi pivnico"
 
 #. 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 ""
@@ -13950,10 +14313,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 ""
@@ -13961,20 +14324,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 "Turizem"
 
 #. 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 ""
@@ -13983,11 +14346,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 "Muzej"
@@ -13995,10 +14358,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 "Uredi muzej"
 
 #. item "Tourism/Museum" text "Name"
-#: build/trans_presets.java:1640
+#: build/trans_presets.java:1641
 msgid "Zoo"
 msgstr "Živalski vrt"
@@ -14007,10 +14370,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 "Uredi živalski vrt"
 
 #. item "Tourism/Zoo" text "Name"
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1648
 msgid "Viewpoint"
 msgstr "Razgledišče"
@@ -14018,25 +14381,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 "Uredi razgledišče"
 
 #. 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 "Umetnina"
@@ -14044,5 +14407,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 "Uredi umetnino"
@@ -14050,5 +14413,5 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1667
 msgid "Information Office"
 msgstr ""
@@ -14056,83 +14419,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 "Zemljevid"
+
 #. 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 ""
@@ -14140,25 +14500,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 "Zgodovinski kraji"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1716
+#: build/trans_presets.java:1717
 msgid "Castle"
 msgstr "Grad"
@@ -14167,20 +14527,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 "Uredi grad"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1724
 msgid "Ruins"
 msgstr "Ruševine"
 
 #. item
-#: build/trans_presets.java:1724
+#: build/trans_presets.java:1725
 msgid "Edit Ruins"
 msgstr "Uredi ruševine"
 
 #. item "Historic Places/Ruins" text "Name"
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1729
 msgid "Archaeological Site"
 msgstr "Arheološko najdišče"
@@ -14189,10 +14549,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 "Uredi arheološko najdišče"
 
 #. item "Historic Places/Archaeological Site" text "Name"
-#: build/trans_presets.java:1735
+#: build/trans_presets.java:1736
 msgid "Battlefield"
 msgstr ""
@@ -14200,5 +14560,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 ""
@@ -14206,15 +14566,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 ""
@@ -14222,45 +14582,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 "Prosti čas"
 
 #. group "Leisure"
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1766
 msgid "Water Park"
 msgstr "Vodni park"
 
 #. item
-#: build/trans_presets.java:1766
+#: build/trans_presets.java:1767
 msgid "Edit Water Park"
 msgstr "Uredi vodni park"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1770
+#: build/trans_presets.java:1771
 msgid "Playground"
 msgstr "Igrišče"
@@ -14268,15 +14628,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 "Uredi igrišče"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1776
+#: build/trans_presets.java:1777
 msgid "Fishing"
 msgstr "Ribarjenje"
 
 #. item
-#: build/trans_presets.java:1777
+#: build/trans_presets.java:1778
 msgid "Edit Fishing"
 msgstr "Uredi ribarjenje"
@@ -14284,15 +14644,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 "Stadion"
 
 #. item
-#: build/trans_presets.java:1785
+#: build/trans_presets.java:1786
 msgid "Edit Stadium"
 msgstr "Uredi stadion"
@@ -14306,6 +14666,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 "izberite šport:"
@@ -14681,6 +15041,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
@@ -14713,227 +15073,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 "lokostrelstvo"
 
-#: 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 "košarka"
 
-#: 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 "plezanje"
 
-#: 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 "kolesarjenje"
 
-#: 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 "golf"
 
-#: 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 "gimnastika"
 
-#: 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 "hokej"
 
-#: 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 "strelišče"
 
-#: 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 "smučanje"
 
-#: 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 "nogomet"
 
-#: 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 "plavanje"
 
-#: 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 "namizni_tenis"
 
-#: 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 "tenis"
 
-#: build/trans_presets.java:1793
+#: build/trans_presets.java:1794
 msgid "Sports Centre"
 msgstr "Športno središče"
 
 #. item
-#: build/trans_presets.java:1794
+#: build/trans_presets.java:1795
 msgid "Edit Sports Centre"
 msgstr "Uredi športno središče"
 
-#: 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 "Golf igrišče"
 
 #. item
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1822
 msgid "Edit Golf Course"
 msgstr "Uredi golf igrišče"
 
 #. item "Sport Facilities/Golf Course" text "Name"
-#: build/trans_presets.java:1825
+#: build/trans_presets.java:1826
 msgid "Miniature Golf"
 msgstr "Mini golf"
 
 #. item
-#: build/trans_presets.java:1826
+#: build/trans_presets.java:1827
 msgid "Edit Miniature Golf"
 msgstr "Uredi mini golf"
 
 #. item "Sport Facilities/Miniature Golf" text "Name"
-#: build/trans_presets.java:1831
+#: build/trans_presets.java:1832
 msgid "Sport"
 msgstr "Šport"
 
 #. 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 ""
@@ -14972,191 +15332,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 "stadion"
 
-#: 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 "Lokostrelstvo"
 
 #. item
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:1852
 msgid "Edit Archery"
 msgstr "Uredi lokostrelstvo"
 
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:1857
 msgid "Climbing"
 msgstr "Plezanje"
 
 #. item
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:1858
 msgid "Edit Climbing"
 msgstr "Uredi plezanje"
 
-#: 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 "Kolesarjenje"
 
 #. item
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1870
 msgid "Edit Cycling"
 msgstr "Uredi kolesarjenje"
 
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1875
 msgid "Dog Racing"
 msgstr "Pasje dirke"
 
 #. item
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1876
 msgid "Edit Dog Racing"
 msgstr "Uredi pasje dirke"
 
-#: 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 "Konjske dirke"
 
 #. item
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1888
 msgid "Edit Horse Racing"
 msgstr "Uredi konjske dirke"
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:1893
 msgid "Gymnastics"
 msgstr "Gimnastika"
 
 #. item
-#: build/trans_presets.java:1893
+#: build/trans_presets.java:1894
 msgid "Edit Gymnastics"
 msgstr "Uredi gimnastiko"
 
-#: 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 "Plavanje"
 
 #. item
-#: build/trans_presets.java:1917
+#: build/trans_presets.java:1918
 msgid "Edit Swimming"
 msgstr "Uredi plavanje"
 
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:1923
 msgid "Skiing"
 msgstr "Smučanje"
@@ -15164,56 +15524,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 "Uredi smučanje"
 
 #. 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 ""
 
 #. 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 ""
 
-#: 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 ""
 
-#: 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 "Strelišče"
@@ -15221,178 +15581,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 "Uredi strelišče"
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1940
 msgid "Sport (Ball)"
 msgstr "Šport (z žogo)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1941
 msgid "Soccer"
 msgstr "Nogomet"
 
 #. item
-#: build/trans_presets.java:1941
+#: build/trans_presets.java:1942
 msgid "Edit Soccer"
 msgstr "Uredi nogomet"
 
-#: 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 ""
 
 #. item
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:1960
 msgid "Edit Baseball"
 msgstr ""
 
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:1965
 msgid "Basketball"
 msgstr "Košarka"
 
 #. item
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:1966
 msgid "Edit Basketball"
 msgstr "Uredi košarko"
 
-#: 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 "Uredi golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1975
 msgid "golf_course"
 msgstr "golf_igrišče"
 
-#: 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 ""
 
 #. item
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:1990
 msgid "Edit Cricket"
 msgstr ""
 
-#: 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 "Hokej"
 
 #. item
-#: build/trans_presets.java:2007
+#: build/trans_presets.java:2008
 msgid "Edit Hockey"
 msgstr "Uredi hokej"
 
-#: 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 ""
 
 #. item
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2026
 msgid "Edit Rugby"
 msgstr ""
 
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:2031
 msgid "Table Tennis"
 msgstr "Namizni tenis"
 
 #. item
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2032
 msgid "Edit Table Tennis"
 msgstr "Uredi namizni tenis"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2037
 msgid "Tennis"
 msgstr "Tenis"
 
 #. item
-#: build/trans_presets.java:2037
+#: build/trans_presets.java:2038
 msgid "Edit Tennis"
 msgstr "Uredi tenis"
 
 #. <separator/>
-#: build/trans_presets.java:2044
+#: build/trans_presets.java:2045
 msgid "Buildings"
 msgstr "Zgradbe"
 
 #. group "Buildings"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2046
 msgid "Building"
 msgstr "Zgradba"
@@ -15400,5 +15760,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2049
 msgid "Public Building"
 msgstr "Javne zgradbe"
@@ -15406,10 +15766,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 "Uredi javno zgradbo"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2055
 msgid "Town hall"
 msgstr "Mestna hiša"
@@ -15417,10 +15777,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 "Uredi mestno hišo"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2061
 msgid "Embassy"
 msgstr "Veleposlaništvo"
@@ -15428,10 +15788,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 "Uredi veleposlaništvo"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2066
+#: build/trans_presets.java:2067
 msgid "Courthouse"
 msgstr "Sodišče"
@@ -15440,10 +15800,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 "Uredi sodišče"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2074
 msgid "Prison"
 msgstr "Zapor"
@@ -15452,10 +15812,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 "Uredi zapor"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2080
+#: build/trans_presets.java:2081
 msgid "Police"
 msgstr "Policijska postaja"
@@ -15465,10 +15825,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 "Uredi policijsko postajo"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2089
 msgid "Fire Station"
 msgstr "Gasilski dom"
@@ -15477,10 +15837,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 "Uredi gasilski dom"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2096
 msgid "Post Office"
 msgstr "Pošta"
@@ -15488,5 +15848,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 "Uredi pošto"
@@ -15494,15 +15854,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2103
 msgid "Kindergarten"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2103
+#: build/trans_presets.java:2104
 msgid "Edit Kindergarten"
 msgstr ""
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2108
 msgid "School"
 msgstr "Šola"
@@ -15510,10 +15870,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 "Uredi šolo"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2114
 msgid "University"
 msgstr ""
@@ -15521,10 +15881,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 ""
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2120
 msgid "College"
 msgstr ""
@@ -15532,5 +15892,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 ""
@@ -15538,5 +15898,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2126
+#: build/trans_presets.java:2127
 msgid "Cinema"
 msgstr "Kinematograf"
@@ -15545,10 +15905,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 "Uredi kinematograf"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2133
+#: build/trans_presets.java:2134
 msgid "Library"
 msgstr "Knjižnica"
@@ -15557,10 +15917,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 "Uredi knjižnico"
 
 #. item "Buildings/Library" text "Name"
-#: build/trans_presets.java:2140
+#: build/trans_presets.java:2141
 msgid "Arts Centre"
 msgstr ""
@@ -15568,10 +15928,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 "Gledališče"
@@ -15580,10 +15940,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 "Uredi gledališče"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2154
 msgid "Place of Worship"
 msgstr "Kraj čaščenja"
@@ -15593,5 +15953,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 "Uredi kraj čaščenja"
@@ -15600,6 +15960,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 "Vera"
@@ -15608,66 +15968,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
-msgid "bahai"
-msgstr ""
-
-#: build/trans_presets.java:2160 build/trans_presets.java:2881
-#: build/trans_presets.java:2890
-msgid "buddhist"
-msgstr ""
-
-#: build/trans_presets.java:2160 build/trans_presets.java:2881
-#: build/trans_presets.java:2890
-msgid "christian"
-msgstr ""
-
-#: build/trans_presets.java:2160 build/trans_presets.java:2881
-#: build/trans_presets.java:2890
-msgid "hindu"
-msgstr ""
-
-#: build/trans_presets.java:2160 build/trans_presets.java:2881
-#: build/trans_presets.java:2890
-msgid "jain"
-msgstr ""
-
-#: build/trans_presets.java:2160 build/trans_presets.java:2881
-#: build/trans_presets.java:2890
-msgid "jewish"
-msgstr ""
-
-#: build/trans_presets.java:2160 build/trans_presets.java:2881
-#: build/trans_presets.java:2890
-msgid "muslim"
-msgstr ""
-
-#: build/trans_presets.java:2160 build/trans_presets.java:2881
-#: build/trans_presets.java:2890
-msgid "sikh"
-msgstr ""
-
-#: build/trans_presets.java:2160 build/trans_presets.java:2881
-#: build/trans_presets.java:2890
-msgid "spiritualist"
-msgstr ""
-
-#: build/trans_presets.java:2160 build/trans_presets.java:2881
-#: build/trans_presets.java:2890
-msgid "taoist"
-msgstr ""
-
-#: build/trans_presets.java:2160 build/trans_presets.java:2881
-#: build/trans_presets.java:2890
-msgid "unitarian"
-msgstr ""
-
-#: build/trans_presets.java:2160 build/trans_presets.java:2881
-#: build/trans_presets.java:2890
-msgid "zoroastrian"
-msgstr ""
-
 #: build/trans_presets.java:2161 build/trans_presets.java:2882
 #: build/trans_presets.java:2891
+msgid "bahai"
+msgstr ""
+
+#: build/trans_presets.java:2161 build/trans_presets.java:2882
+#: build/trans_presets.java:2891
+msgid "buddhist"
+msgstr ""
+
+#: build/trans_presets.java:2161 build/trans_presets.java:2882
+#: build/trans_presets.java:2891
+msgid "christian"
+msgstr ""
+
+#: build/trans_presets.java:2161 build/trans_presets.java:2882
+#: build/trans_presets.java:2891
+msgid "hindu"
+msgstr ""
+
+#: build/trans_presets.java:2161 build/trans_presets.java:2882
+#: build/trans_presets.java:2891
+msgid "jain"
+msgstr ""
+
+#: build/trans_presets.java:2161 build/trans_presets.java:2882
+#: build/trans_presets.java:2891
+msgid "jewish"
+msgstr ""
+
+#: build/trans_presets.java:2161 build/trans_presets.java:2882
+#: build/trans_presets.java:2891
+msgid "muslim"
+msgstr ""
+
+#: build/trans_presets.java:2161 build/trans_presets.java:2882
+#: build/trans_presets.java:2891
+msgid "sikh"
+msgstr ""
+
+#: build/trans_presets.java:2161 build/trans_presets.java:2882
+#: build/trans_presets.java:2891
+msgid "spiritualist"
+msgstr ""
+
+#: build/trans_presets.java:2161 build/trans_presets.java:2882
+#: build/trans_presets.java:2891
+msgid "taoist"
+msgstr ""
+
+#: build/trans_presets.java:2161 build/trans_presets.java:2882
+#: build/trans_presets.java:2891
+msgid "unitarian"
+msgstr ""
+
+#: build/trans_presets.java:2161 build/trans_presets.java:2882
+#: build/trans_presets.java:2891
+msgid "zoroastrian"
+msgstr ""
+
+#: build/trans_presets.java:2162 build/trans_presets.java:2883
+#: build/trans_presets.java:2892
 msgid "Denomination"
 msgstr ""
@@ -15676,81 +16036,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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 "Naslovi"
@@ -15759,5 +16119,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 "Urejanje podatkov o naslovu"
@@ -15765,5 +16125,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2169
+#: build/trans_presets.java:2170
 msgid "House number"
 msgstr ""
@@ -15771,20 +16131,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2172
 msgid "House name"
 msgstr ""
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2174
 msgid "City name"
 msgstr ""
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2174
+#: build/trans_presets.java:2175
 msgid "Post code"
 msgstr "Poštna številka"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2176
 msgid "Country code"
 msgstr ""
@@ -15792,5 +16152,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2179
 msgid "Address Interpolation"
 msgstr "Interpolacija naslovov"
@@ -15799,5 +16159,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 "Uredi interpolacijo naslovov"
@@ -15805,71 +16165,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 ""
 
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2184
 msgid "even"
 msgstr ""
 
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2184
 msgid "all"
 msgstr ""
 
-#: 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 ""
 
 #. group "Man Made"
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2188
 msgid "Works"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2189
 msgid "Edit Works"
 msgstr ""
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2193
 msgid "Tower"
 msgstr "Stolp"
 
 #. item
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2194
 msgid "Edit Tower"
 msgstr "Uredi stolp"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2198
 msgid "Water Tower"
 msgstr "Vodni stolp"
 
 #. item
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2199
 msgid "Edit Water Tower"
 msgstr "Uredi vodni stolp"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2203
 msgid "Gasometer"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2204
 msgid "Edit Gasometer"
 msgstr ""
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2207
+#: build/trans_presets.java:2208
 msgid "Lighthouse"
 msgstr "Svetilnik"
@@ -15877,10 +16237,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 "Uredi svetilnik"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2214
 msgid "Windmill"
 msgstr "Mlin na veter"
@@ -15888,10 +16248,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 "Uredi mlin na veter"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2220
 msgid "Pipeline"
 msgstr "Cevovod"
@@ -15899,10 +16259,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 "Uredi cevovod"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2225
+#: build/trans_presets.java:2226
 msgid "Wastewater Plant"
 msgstr "Čistilna naprava"
@@ -15912,10 +16272,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 "Uredi čistilno napravo"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2233
+#: build/trans_presets.java:2234
 msgid "Crane"
 msgstr "Žerjav"
@@ -15923,10 +16283,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 "Uredi žerjav"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2239
+#: build/trans_presets.java:2240
 msgid "Beacon"
 msgstr ""
@@ -15934,10 +16294,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 ""
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2245
+#: build/trans_presets.java:2246
 msgid "Survey Point"
 msgstr "Geodetska točka"
@@ -15945,10 +16305,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 "Uredi geodetsko točko"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2252
 msgid "Surveillance"
 msgstr "Video nadzor"
@@ -15956,5 +16316,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 "Uredi video nadzorno kamero"
@@ -15962,5 +16322,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2258
+#: build/trans_presets.java:2259
 msgid "Power Generator"
 msgstr ""
@@ -15970,39 +16330,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 ""
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "wind"
 msgstr ""
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "hydro"
 msgstr ""
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "fossil"
 msgstr ""
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "nuclear"
 msgstr ""
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "coal"
 msgstr ""
 
-#: 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 ""
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2268
 msgid "Power Station"
 msgstr ""
@@ -16011,10 +16371,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 ""
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2274
+#: build/trans_presets.java:2275
 msgid "Power Sub Station"
 msgstr ""
@@ -16023,5 +16383,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 ""
@@ -16029,10 +16389,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 "Steber daljnovoda"
@@ -16043,5 +16403,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 "Uredi steber daljnovoda"
@@ -16049,5 +16409,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 ""
@@ -16056,25 +16416,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 ""
 
 #. 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 "Stranišča"
@@ -16082,20 +16442,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 ""
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2312
 msgid "Post Box"
 msgstr "Poštni nabiralnik"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2317
 msgid "Telephone"
 msgstr "Telefon"
@@ -16104,5 +16464,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 "Uredi telefon"
@@ -16110,5 +16470,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 "Kovanci"
@@ -16116,5 +16476,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 "Bankovci"
@@ -16122,5 +16482,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 ""
@@ -16128,5 +16488,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 "Debetne kartice"
@@ -16134,15 +16494,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 "Kreditne kartice"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2328
 msgid "Telephone cards"
 msgstr "Telefonske kartice"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2330
 msgid "Recycling"
 msgstr "Recikliranje"
@@ -16151,5 +16511,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 "Uredi raciklažno točko"
@@ -16157,35 +16517,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 ""
 
 #. 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 ""
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2338
 msgid "Glass"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2339
 msgid "Paper"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2340
 msgid "Scrap Metal"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2342
 msgid "Bench"
 msgstr "Klopca"
@@ -16194,20 +16554,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 ""
 
 #. item
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2347
 msgid "Edit Hunting Stand"
 msgstr ""
 
 #. item "Amenities/Hunting Stand" check "Shelter"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2350
 msgid "Hide"
 msgstr ""
 
 #. item "Amenities/Hunting Stand" check "Hide"
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2351
 msgid "Lock"
 msgstr ""
@@ -16215,22 +16575,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 ""
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2351
+#: build/trans_presets.java:2352
 msgid "low"
 msgstr ""
 
-#: build/trans_presets.java:2351
+#: build/trans_presets.java:2352
 msgid "half"
 msgstr ""
 
-#: build/trans_presets.java:2351
+#: build/trans_presets.java:2352
 msgid "full"
 msgstr ""
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2354
 msgid "Fountain"
 msgstr ""
@@ -16239,10 +16599,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 ""
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2361
 msgid "Drinking Water"
 msgstr "Pitna voda"
@@ -16251,10 +16611,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 "Uredi pitno vodo"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2367
+#: build/trans_presets.java:2368
 msgid "Baby Hatch"
 msgstr ""
@@ -16262,25 +16622,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 "Trgovine"
 
 #. group "Shops"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2377
 msgid "Supermarket"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2378
 msgid "Edit Supermarket"
 msgstr ""
 
 #. item "Shops/Supermarket" text "Name"
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:2382
 msgid "Convenience Store"
 msgstr ""
@@ -16288,10 +16648,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 ""
@@ -16299,10 +16659,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 ""
 
 #. item "Shops/Kiosk" text "Name"
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2394
 msgid "Vending machine"
 msgstr "Prodajni avtomat"
@@ -16310,5 +16670,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 "Uredi prodajni avtomat"
@@ -16316,88 +16676,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 "Prodajani izdelki"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "public_transport_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "public_transport_plans"
 msgstr ""
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "parking_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "food"
 msgstr ""
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "drinks"
 msgstr "pijača"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "sweets"
 msgstr ""
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "cigarettes"
 msgstr ""
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "photos"
 msgstr ""
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "animal_food"
 msgstr ""
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "news_papers"
 msgstr ""
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "toys"
 msgstr ""
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "stamps"
 msgstr ""
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "SIM-cards"
 msgstr "SIM kartice"
 
-#: 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 ""
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "tampons"
 msgstr ""
 
-#: 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 "Mesar"
@@ -16405,10 +16765,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 "Uredi mesarja"
 
 #. item "Shops/Butcher" text "Name"
-#: build/trans_presets.java:2414
+#: build/trans_presets.java:2415
 msgid "Baker"
 msgstr "Pekarna"
@@ -16416,10 +16776,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 "Uredi pekarno"
 
 #. item "Shops/Baker" text "Name"
-#: build/trans_presets.java:2420
+#: build/trans_presets.java:2421
 msgid "Florist"
 msgstr ""
@@ -16427,20 +16787,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 ""
 
 #. 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 ""
@@ -16448,60 +16808,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 ""
 
 #. 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 ""
 
 #. item
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2444
 msgid "Edit Computer Shop"
 msgstr ""
 
 #. item "Shops/Computer" text "Name"
-#: build/trans_presets.java:2447
+#: build/trans_presets.java:2448
 msgid "Electronics"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2448
+#: build/trans_presets.java:2449
 msgid "Edit Electronics Shop"
 msgstr ""
 
 #. 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 ""
 
 #. item
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2459
 msgid "Edit Furniture Shop"
 msgstr ""
 
 #. item "Shops/Furniture" text "Name"
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2463
 msgid "Garden Centre"
 msgstr ""
@@ -16509,10 +16869,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 ""
 
 #. item "Shops/Garden Centre" text "Name"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2469
 msgid "Hardware"
 msgstr ""
@@ -16520,10 +16880,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 ""
 
 #. item "Shops/Hardware" text "Name"
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2475
 msgid "Do-it-yourself-store"
 msgstr "Sam svoj mojster"
@@ -16531,60 +16891,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 "Uredi sam svoj mojster trgovino"
 
 #. item "Shops/Do-it-yourself-store" text "Name"
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2481
 msgid "Stationery"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2482
 msgid "Edit Stationery Shop"
 msgstr ""
 
 #. item "Shops/Stationery" text "Name"
-#: build/trans_presets.java:2485
+#: build/trans_presets.java:2486
 msgid "Hairdresser"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2486
+#: build/trans_presets.java:2487
 msgid "Edit Hairdresser"
 msgstr ""
 
 #. item "Shops/Hairdresser" text "Name"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2491
 msgid "Shoes"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2492
 msgid "Edit Shoe Shop"
 msgstr ""
 
 #. item "Shops/Shoes" text "Name"
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2496
 msgid "Toys"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2497
 msgid "Edit Toy Shop"
 msgstr ""
 
 #. item "Shops/Toys" text "Name"
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2501
 msgid "Video"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2502
 msgid "Edit Video Shop"
 msgstr ""
 
 #. item "Shops/Video" text "Name"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2506
 msgid "Dry Cleaning"
 msgstr "Čistilnica"
@@ -16592,10 +16952,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 "Uredi čistilnico"
 
 #. item "Shops/Dry Cleaning" text "Name"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2512
 msgid "Laundry"
 msgstr "Pralnica"
@@ -16603,10 +16963,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 "Uredi pralnico"
 
 #. item "Shops/Laundry" text "Name"
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2518
 msgid "Outdoor"
 msgstr ""
@@ -16614,35 +16974,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 ""
 
 #. item "Shops/Outdoor" text "Name"
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2524
 msgid "Sports"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2525
 msgid "Edit Sports Shop"
 msgstr ""
 
 #. item "Shops/Sports" text "Name"
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2529
 msgid "Optician"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2530
 msgid "Edit Optician"
 msgstr ""
 
 #. item "Shops/Optician" text "Name"
-#: build/trans_presets.java:2535
+#: build/trans_presets.java:2536
 msgid "Cash"
 msgstr "Denar"
 
 #. group "Cash"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2537
 msgid "Bank"
 msgstr "Banka"
@@ -16650,5 +17010,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 "Uredi banko"
@@ -16656,10 +17016,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 "Bankomat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2544
 msgid "Money Exchange"
 msgstr "Menjalnica"
@@ -16667,5 +17027,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 "Uredi menjalnico"
@@ -16673,15 +17033,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 "Uredi bankomat"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2557
 msgid "Health"
 msgstr "Zdravje"
 
 #. group "Health"
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2558
 msgid "Doctors"
 msgstr ""
@@ -16689,20 +17049,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 ""
 
 #. item "Health/Doctors" text "Name"
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2564
 msgid "Dentist"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2565
 msgid "Edit Dentist"
 msgstr ""
 
 #. item "Health/Dentist" text "Name"
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2569
 msgid "Pharmacy"
 msgstr "Lekarna"
@@ -16710,5 +17070,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 "Uredi lekarno"
@@ -16716,10 +17076,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 ""
 
 #. item "Health/Pharmacy" text "Name"
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2576
 msgid "Hospital"
 msgstr "Bolnišnica"
@@ -16727,10 +17087,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 "Uredi bolnišnico"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2582
 msgid "Emergency Access Point"
 msgstr ""
@@ -16739,5 +17099,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 ""
@@ -16746,20 +17106,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2588
 msgid "Point Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2589
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2591
 msgid "Phone Number"
 msgstr ""
 
 #. 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 ""
@@ -16767,5 +17127,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 ""
@@ -16774,25 +17134,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 ""
 
 #. 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 "Uredi kontinent"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2611
 msgid "Country"
 msgstr "Država"
 
 #. item
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2612
 msgid "Edit Country"
 msgstr "Uredi državo"
@@ -16800,30 +17160,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 ""
 
 #. item
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2618
 msgid "Edit State"
 msgstr ""
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2622
+#: build/trans_presets.java:2623
 msgid "Region"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2623
+#: build/trans_presets.java:2624
 msgid "Edit Region"
 msgstr ""
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2628
+#: build/trans_presets.java:2629
 msgid "County"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2629
+#: build/trans_presets.java:2630
 msgid "Edit County"
 msgstr ""
@@ -16831,15 +17191,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2635
+#: build/trans_presets.java:2636
 msgid "City"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2636
+#: build/trans_presets.java:2637
 msgid "Edit City"
 msgstr ""
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2641
+#: build/trans_presets.java:2642
 msgid "Town"
 msgstr ""
@@ -16847,10 +17207,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 ""
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2649
 msgid "Suburb"
 msgstr ""
@@ -16858,25 +17218,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 ""
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2656
 msgid "Village"
 msgstr "Vas"
 
 #. item
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2657
 msgid "Edit Village"
 msgstr "Uredi vas"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2662
 msgid "Hamlet"
 msgstr "Zaselek"
 
 #. item
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2663
 msgid "Edit Hamlet"
 msgstr "Uredi zaselek"
@@ -16884,5 +17244,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2669
 msgid "Locality"
 msgstr ""
@@ -16890,10 +17250,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 ""
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2676
 msgid "Island"
 msgstr "Otok"
@@ -16901,5 +17261,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 "Uredi otok"
@@ -16907,5 +17267,5 @@
 #. item "Places/Island" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2683
+#: build/trans_presets.java:2684
 msgid "Cave Entrance"
 msgstr ""
@@ -16913,10 +17273,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 ""
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2690
 msgid "Peak"
 msgstr "Vrh"
@@ -16924,10 +17284,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 "Uredi vrh"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2697
 msgid "Glacier"
 msgstr ""
@@ -16935,10 +17295,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 ""
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2703
+#: build/trans_presets.java:2704
 msgid "Volcano"
 msgstr ""
@@ -16946,70 +17306,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 ""
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2711
+#: build/trans_presets.java:2712
 msgid "Boundaries"
 msgstr "Meje"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2713
 msgid "National"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2714
 msgid "Edit National Boundary"
 msgstr ""
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2718
+#: build/trans_presets.java:2719
 msgid "Administrative"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2720
 msgid "Edit Administrative Boundary"
 msgstr ""
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2724
+#: build/trans_presets.java:2725
 msgid "Civil"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2725
+#: build/trans_presets.java:2726
 msgid "Edit Civil Boundary"
 msgstr ""
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2730
+#: build/trans_presets.java:2731
 msgid "Political"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:2732
 msgid "Edit Political Boundary"
 msgstr ""
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2736
+#: build/trans_presets.java:2737
 msgid "National park"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2737
+#: build/trans_presets.java:2738
 msgid "Edit National Park Boundary"
 msgstr ""
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2744
 msgid "Land use"
 msgstr "Raba tal"
 
 #. group "Land use"
-#: build/trans_presets.java:2744
+#: build/trans_presets.java:2745
 msgid "Tree"
 msgstr "Drevo"
@@ -17018,15 +17378,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 "Uredi drevo"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2753
 msgid "Botanical Name"
 msgstr ""
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2755
 msgid "Wood"
 msgstr ""
@@ -17035,5 +17395,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 ""
@@ -17041,17 +17401,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 ""
 
-#: build/trans_presets.java:2760 build/trans_presets.java:2769
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
 msgid "deciduous"
 msgstr ""
 
-#: build/trans_presets.java:2760 build/trans_presets.java:2769
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
 msgid "mixed"
 msgstr ""
 
-#: build/trans_presets.java:2762
+#: build/trans_presets.java:2763
 msgid "Forest"
 msgstr "Gozd"
@@ -17060,14 +17420,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 "Uredi gozdnata tla"
 
-#: build/trans_presets.java:2771
+#: build/trans_presets.java:2772
 msgid "Nature Reserve"
 msgstr "Naravni rezervat"
 
 #. item
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2773
 msgid "Edit Nature Reserve"
 msgstr "Uredi naravni rezervat"
@@ -17075,25 +17435,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2777
+#: build/trans_presets.java:2778
 msgid "Scree"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:2779
 msgid "Edit Scree"
 msgstr ""
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2783
 msgid "Scrub"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2783
+#: build/trans_presets.java:2784
 msgid "Edit Scrub"
 msgstr ""
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2788
 msgid "Fell"
 msgstr ""
@@ -17101,10 +17461,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 ""
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2794
 msgid "Heath"
 msgstr ""
@@ -17112,5 +17472,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 ""
@@ -17118,5 +17478,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2801
 msgid "Farmyard"
 msgstr ""
@@ -17125,45 +17485,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 ""
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2808
+#: build/trans_presets.java:2809
 msgid "Farmland"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2810
 msgid "Edit Farmland Landuse"
 msgstr ""
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2814
+#: build/trans_presets.java:2815
 msgid "Meadow"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2816
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2820
+#: build/trans_presets.java:2821
 msgid "Vineyard"
 msgstr "Vinograd"
 
 #. item
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2822
 msgid "Edit Vineyard Landuse"
 msgstr "Uredi vinograd"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2826
+#: build/trans_presets.java:2827
 msgid "Allotments"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:2828
 msgid "Edit Allotments Landuse"
 msgstr ""
@@ -17171,25 +17531,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2833
+#: build/trans_presets.java:2834
 msgid "Garden"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2835
 msgid "Edit Garden"
 msgstr ""
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2838
+#: build/trans_presets.java:2839
 msgid "Grass"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2839
+#: build/trans_presets.java:2840
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2845
 msgid "Village Green"
 msgstr ""
@@ -17197,10 +17557,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 ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:2852
 msgid "Common"
 msgstr ""
@@ -17208,20 +17568,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 ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2858
 msgid "Park"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:2859
 msgid "Edit Park"
 msgstr ""
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2863
 msgid "Recreation Ground"
 msgstr ""
@@ -17229,5 +17589,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 ""
@@ -17235,15 +17595,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2871
 msgid "Residential area"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2872
 msgid "Edit Residential Landuse"
 msgstr ""
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2877
 msgid "Graveyard"
 msgstr "Pokopališče"
@@ -17251,9 +17611,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 "Uredi pokopališče"
 
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:2885
 msgid "Cemetery"
 msgstr ""
@@ -17261,39 +17621,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 ""
 
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2894
 msgid "Retail"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2895
 msgid "Edit Retail Landuse"
 msgstr ""
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2900
 msgid "Commercial"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2901
 msgid "Edit Commercial Landuse"
 msgstr ""
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2906
 msgid "Industrial"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2906
+#: build/trans_presets.java:2907
 msgid "Edit Industrial Landuse"
 msgstr ""
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2912
 msgid "Railway land"
 msgstr "Ozemlje železnice"
@@ -17301,15 +17661,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 "Uredi ozemlje železnice"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:2919
 msgid "Military"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2920
 msgid "Edit Military Landuse"
 msgstr ""
@@ -17317,55 +17677,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2925
+#: build/trans_presets.java:2926
 msgid "Construction area"
 msgstr "Gradbišče"
 
 #. item
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2927
 msgid "Edit Construction Landuse"
 msgstr ""
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2932
 msgid "Brownfield"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:2933
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2937
+#: build/trans_presets.java:2938
 msgid "Greenfield"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:2939
 msgid "Edit Greenfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:2944
 msgid "Landfill"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:2945
 msgid "Edit Landfill Landuse"
 msgstr ""
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2950
 msgid "Quarry"
 msgstr "Kamnolom"
 
 #. item
-#: build/trans_presets.java:2950
+#: build/trans_presets.java:2951
 msgid "Edit Quarry Landuse"
 msgstr "Uredi kamnolom"
 
 #. group "Relations"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2960
 msgid "Multipolygon"
 msgstr ""
@@ -17375,5 +17735,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 ""
@@ -17382,10 +17742,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:2970
 msgid "outer segment"
 msgstr ""
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:2970
+#: build/trans_presets.java:2971
 msgid "inner segment"
 msgstr ""
@@ -17393,5 +17753,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:2974
 msgid "Turn restriction"
 msgstr ""
@@ -17400,5 +17760,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 ""
@@ -17406,34 +17766,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 ""
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_straight_on"
 msgstr ""
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_u_turn"
 msgstr ""
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "only_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "only_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "only_straight_on"
 msgstr ""
@@ -17442,15 +17802,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2983
+#: build/trans_presets.java:2984
 msgid "from way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2985
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2986
 msgid "to way"
 msgstr ""
@@ -17458,5 +17818,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:2988
+#: build/trans_presets.java:2989
 msgid "Route"
 msgstr ""
@@ -17465,5 +17825,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 ""
@@ -17471,5 +17831,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 ""
@@ -17541,5 +17901,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
@@ -17548,17 +17908,17 @@
 msgstr ""
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "bus"
 msgstr ""
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "ski"
 msgstr ""
@@ -17611,5 +17971,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
@@ -17618,13 +17978,13 @@
 msgstr ""
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "hiking"
 msgstr ""
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "detour"
 msgstr ""
@@ -17638,10 +17998,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 ""
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:2997
 msgid "Symbol description"
 msgstr ""
@@ -17649,26 +18009,26 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:2999
+#: build/trans_presets.java:3000
 msgid "Network"
 msgstr ""
 
 #. item "Relations/Route" combo "State"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3003
 msgid "Color (hex)"
 msgstr ""
@@ -17677,30 +18037,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:3006
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3007
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3008
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3009
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3010
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3011
 msgid "backward halt point"
 msgstr ""
@@ -21815,6 +22175,19 @@
 msgstr ""
 
+#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
+#~ msgstr ""
+#~ "Za premikanje in povečavo lahko uporabite miško ali <ctrl>+<smerne tipke>."
+
 #~ msgid "Uploading data"
 #~ msgstr "Pošiljanje podatkov"
+
+#~ msgid "Email"
+#~ msgstr "E-pošta"
+
+#~ msgid "Login name (email) to the OSM account."
+#~ msgstr "Uporabniško ime (email) vašega računa pri OSM."
+
+#~ msgid "OSM username (email)"
+#~ msgstr "OSM uporabniško ime (email)"
 
 #~ msgid "Unknown host"
@@ -21854,4 +22227,14 @@
 
 #~ 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 URL.<br><b>Do not use a valuable Password.</b></html>"
+#~ msgstr ""
+#~ "<html>POZOR: Geslo je shranjeno v datoteki z nastavitvami v obliki "
+#~ "navadnega besedila.<br>Geslo se na strežnik prenaša nekriptirano v "
+#~ "naslovu URL.<br><b>Ne uporabljaj gesla enakega nekeu drugemu pomembnemu "
+#~ "geslu.</b></html>"
+
+#~ msgid ""
 #~ "The plugin {0} seems to be broken or could not be downloaded "
 #~ "automatically."
Index: applications/editors/josm/i18n/po/sv.po
===================================================================
--- applications/editors/josm/i18n/po/sv.po	(revision 16008)
+++ applications/editors/josm/i18n/po/sv.po	(revision 16009)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-14 16:51+0200\n"
-"PO-Revision-Date: 2009-06-13 13:46+0000\n"
-"Last-Translator: Zippert <Unknown>\n"
+"POT-Creation-Date: 2009-06-19 21:52+0200\n"
+"PO-Revision-Date: 2009-06-14 17:51+0000\n"
+"Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-06-14 14:46+0000\n"
+"X-Launchpad-Export-Date: 2009-06-19 19:35+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 "Hjälp"
 
 #: ../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 ""
 
@@ -71,6 +71,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
@@ -87,8 +89,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
@@ -137,5 +139,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"
@@ -537,5 +539,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}"
@@ -607,6 +609,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:92
-msgid "Email"
-msgstr "Email"
+msgid "E-Mail"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:96
@@ -644,12 +646,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
@@ -676,5 +680,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
@@ -707,15 +711,13 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:207
 #, java-format
-msgid "Helppage missing. Create it in <A HREF=\"{0}\">english</A>."
-msgstr "Hjälpsida saknas. Skapa den på <A HREF=\"{0}\">engelska</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 ""
-"Hjälpsida saknas. Skapa den på <A HREF=\"{0}\">engelska</A> eller <A HREF="
-"\"{1}\">ditt språk</A>."
 
 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:26
@@ -1150,13 +1152,13 @@
 msgstr "Hjälp: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:99
 msgid "Status Report"
 msgstr "Statusrapport"
 
-#: ../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 "Kopiera till urklipp och stäng"
 
-#: ../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
@@ -1359,16 +1361,14 @@
 msgstr "Avmarkera allt (Escape)"
 
-#: ../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 "Uppdatera data"
 
-#: ../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 "Uppdaterar det aktuella datalagret från servern (hämtar hem data igen)"
 
-#: ../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?"
@@ -1377,87 +1377,258 @@
 "ner ett datalager?"
 
-#: ../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 ""
-"Denna handling kräver {0} enskilda hämtningsförfrågningar. Vill du fortsätta?"
-
-#: ../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 "Skicka in till OSM..."
 
-#: ../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 "Skicka in alla ändringar till OSM-servern."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:96
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:94
 msgid "Objects to add:"
 msgstr "Nya objekt:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102
 msgid "Objects to modify:"
 msgstr "Ändrade objekt:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:110
 msgid "Objects to delete:"
 msgstr "Borttagna objekt:"
 
-#: ../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 "Ge en kort kommentar till de ändringar som du skickar in:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:126
 msgid "Upload these changes?"
 msgstr "Skicka in dessa ändringar?"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:130
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
 msgid "Upload Changes"
 msgstr "Skicka in ändringar"
 
-#: ../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 "Det finns inte någonting att skicka in. Skaffa lite data först."
 
-#: ../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 "Det finns olösta konflikter. Du måste lösa dessa först."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:182
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:180
 msgid "No changes to upload."
 msgstr "Det finns inte några ändringar att skicka in."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:203
 msgid "Uploading"
 msgstr "Ladda Upp"
 
-#: ../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 "Uppladningen till OSM API misslyckades"
 
-#: ../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 ""
@@ -1562,37 +1733,51 @@
 msgstr "Rå GPS-data"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:44
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:46
 msgid "Downloading data"
 msgstr "Hämtar data"
 
-#: ../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 "Ingen data importerad."
 
-#: ../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 "Datalager {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 "OpenStreetMap-data"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:37
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:45
 msgid "Data Layer"
 msgstr "Datalager"
 
-#: ../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 "Laddar ner {0} av {1} ({2} kvar)"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:88
-msgid "The following errors occured during mass download:"
-msgstr "Följande fel uppstod vid massnedladdning:"
-
-#: ../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 "Fel under nedladdning"
+
+#: ../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
@@ -1645,34 +1830,34 @@
 msgstr "Det går inte att lägga till en nod utanför världen."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:495
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:493
 msgid "Add node"
 msgstr "Lägg till nod"
 
-#: ../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 "Lägg till en nod till sträckan"
 
-#: ../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 "Knyt en existerande nod till en sträcka"
 
-#: ../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 "Lägg till en ny nod i en befintlig sträcka"
 
-#: ../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 "Lägg till en nod i en sträcka och bind ihop"
 
-#: ../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 "Skapa ny nod"
 
-#: ../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 "Markera nod under pekare."
 
-#: ../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."
@@ -1681,14 +1866,14 @@
 msgstr[1] "Infoga ny nod i {0} vägar."
 
-#: ../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 "Starta ny väg från senaste nod."
 
-#: ../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 "Fortsätt väg från senaste nod."
 
-#: ../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 "Avsluta ritning."
@@ -2017,26 +2202,32 @@
 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 "Hämta urval"
 
-#: ../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 "Kontakta {0}..."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:45
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:46
 msgid "Downloading..."
 msgstr "Hämtar..."
 
-#: ../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 "Kunde inte läsa från URL:en: \"{0}\""
 
-#: ../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 "Inläsningsfel på URL:en: \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:74
+msgid "Error while communicating with server."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67
@@ -2097,13 +2288,85 @@
 msgstr "Jämka {0} konflikter i {1} objekt"
 
-#: ../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 "Ta bort {1} {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97
+#, java-format
+msgid "Delete {0} {1}"
+msgstr "Ta bort {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153
+msgid "Conflicting relation"
+msgstr "Relationskonflikt"
+
+#: ../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 ""
+"Urvalet \"{0}\" ingår i relationen \"{1}\" med rollen {2}\n"
+"Ta bort från relationen?"
+
+#: ../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 "Ta bort från relation"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
+#, java-format
+msgid ""
+"Selection \"{0}\" is used by relation \"{1}\".\n"
+"Delete from relation?"
+msgstr ""
+"Urvalet \"{0}\" ingår i relationen \"{1}\"\n"
+"Ta bort från relationen?"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:366
+msgid "Split way segment"
+msgstr "Dela delsträcka"
+
+#. 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 ""
+"Du håller på att ta bort noder utanför det område som du har hämtat hem.<br> "
+"Detta kan leda till problem eftersom andra objekt (som du inte ser) kanske "
+"använder dem.<br> Vill du verkligen ta bort dem?"
+
+#: ../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 "Flytta"
+
 #: ../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"
@@ -2112,10 +2375,219 @@
 msgstr[1] "noder"
 
-#: ../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 "TaBortRelationsMedlem"
+
+#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
+msgid "Rotate"
+msgstr "Rotera"
+
+#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88
+msgid "Sequence"
+msgstr "Sekvens"
+
+#: ../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 "Tillämpa?"
+
+#: ../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 ""
+"Vid riktningsbyte på denna sträcka, så föreslås följande egenskaper hos "
+"sträckan och dess noder ändras så att dataintegriteten inte komprometteras."
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28
+msgid "Relation"
+msgstr "Relation"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30
+msgid "Old role"
+msgstr "Gammal roll"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:32
+msgid "New role"
+msgstr "Ny roll"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
+msgid "Old key"
+msgstr "Gammal nyckel"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
+msgid "Old value"
+msgstr "Gammalt värde"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
+msgid "New key"
+msgstr "Ny nyckel"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
+msgid "New value"
+msgstr "Nytt värde"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:40
+msgid "Apply selected changes"
+msgstr "Verkställ valda ändringar"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41
+msgid "Don't apply changes"
+msgstr "Verkställ inte ändringar"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:83
+msgid "Please select which property changes you want to apply."
+msgstr "Välj vilka ändringar av egenskaper som du vill genomföra."
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:96
+msgid "Properties of "
+msgstr "Egenskaper för "
+
+#: ../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 "Automatisk taggrättning"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:314
+#, java-format
+msgid "Malformed config file at lines {0}"
+msgstr "Fel i konfigurationsfilen på raderna {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:324
+#, java-format
+msgid "Cannot open preferences directory: {0}"
+msgstr "Kan inte öppna inställningsmappen: {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 "Det fanns fel i inställningsfilen. Backar upp den gamla som {0}."
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:79
+#, java-format
+msgid "Preferences stored on {0}"
+msgstr "Inställningar lagrade på {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:82
+#, java-format
+msgid "Could not upload preferences. Reason: {0}"
+msgstr "Kunde inte skicka in inställningar. Orsak: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:93
+msgid "Could not load preferences from server."
+msgstr "Kunde inte hämta inställningar från server."
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:34
+msgid "different"
+msgstr "olik"
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:262
+msgid "deleted"
+msgstr "raderad"
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
+msgid "true"
+msgstr "sann"
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
+msgid "false"
+msgstr "falsk"
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20
+msgid "position"
+msgstr "position"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30
+msgid "Decimal Degrees"
+msgstr "Decimalgrader"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
+msgid "Degrees Minutes Seconds"
+msgstr "Grader Minuter Sekunder"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+msgid "S"
+msgstr "S"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+msgid "N"
+msgstr "N"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+msgid "W"
+msgstr "V"
+
+#: ../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 "ofullständig"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
+#, java-format
+msgid "Error: {0}"
+msgstr "Fel: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
+#, java-format
+msgid "Warning: {0}"
+msgstr "Varning: {0}"
+
+#: ../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"
@@ -2124,8 +2596,10 @@
 msgstr[1] "sträckor"
 
-#: ../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
@@ -2136,265 +2610,27 @@
 msgstr[1] "relationer"
 
-#: ../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 "Ta bort {1} {0}"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97
-#, java-format
-msgid "Delete {0} {1}"
-msgstr "Ta bort {0} {1}"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153
-msgid "Conflicting relation"
-msgstr "Relationskonflikt"
-
-#: ../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 ""
-"Urvalet \"{0}\" ingår i relationen \"{1}\" med rollen {2}\n"
-"Ta bort från relationen?"
-
-#: ../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 "Ta bort från relation"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
-#, java-format
-msgid ""
-"Selection \"{0}\" is used by relation \"{1}\".\n"
-"Delete from relation?"
-msgstr ""
-"Urvalet \"{0}\" ingår i relationen \"{1}\"\n"
-"Ta bort från relationen?"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:366
-msgid "Split way segment"
-msgstr "Dela delsträcka"
-
-#. 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 ""
-"Du håller på att ta bort noder utanför det område som du har hämtat hem.<br> "
-"Detta kan leda till problem eftersom andra objekt (som du inte ser) kanske "
-"använder dem.<br> Vill du verkligen ta bort dem?"
-
-#: ../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 "Flytta"
-
-#: ../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 "TaBortRelationsMedlem"
-
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
-msgid "Rotate"
-msgstr "Rotera"
-
-#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88
-msgid "Sequence"
-msgstr "Sekvens"
-
-#: ../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 "Tillämpa?"
-
-#: ../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 ""
-"Vid riktningsbyte på denna sträcka, så föreslås följande egenskaper hos "
-"sträckan och dess noder ändras så att dataintegriteten inte komprometteras."
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28
-msgid "Relation"
-msgstr "Relation"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30
-msgid "Old role"
-msgstr "Gammal roll"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:32
-msgid "New role"
-msgstr "Ny roll"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
-msgid "Old key"
-msgstr "Gammal nyckel"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
-msgid "Old value"
-msgstr "Gammalt värde"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
-msgid "New key"
-msgstr "Ny nyckel"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
-msgid "New value"
-msgstr "Nytt värde"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:40
-msgid "Apply selected changes"
-msgstr "Verkställ valda ändringar"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41
-msgid "Don't apply changes"
-msgstr "Verkställ inte ändringar"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:83
-msgid "Please select which property changes you want to apply."
-msgstr "Välj vilka ändringar av egenskaper som du vill genomföra."
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:96
-msgid "Properties of "
-msgstr "Egenskaper för "
-
-#: ../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 "Automatisk taggrättning"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:314
-#, java-format
-msgid "Malformed config file at lines {0}"
-msgstr "Fel i konfigurationsfilen på raderna {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:324
-#, java-format
-msgid "Cannot open preferences directory: {0}"
-msgstr "Kan inte öppna inställningsmappen: {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 "Det fanns fel i inställningsfilen. Backar upp den gamla som {0}."
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:79
-#, java-format
-msgid "Preferences stored on {0}"
-msgstr "Inställningar lagrade på {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:82
-#, java-format
-msgid "Could not upload preferences. Reason: {0}"
-msgstr "Kunde inte skicka in inställningar. Orsak: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:93
-msgid "Could not load preferences from server."
-msgstr "Kunde inte hämta inställningar från server."
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:34
-msgid "different"
-msgstr "olik"
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:262
-msgid "deleted"
-msgstr "raderad"
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
-msgid "true"
-msgstr "sann"
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
-msgid "false"
-msgstr "falsk"
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20
-msgid "position"
-msgstr "position"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30
-msgid "Decimal Degrees"
-msgstr "Decimalgrader"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
-msgid "Degrees Minutes Seconds"
-msgstr "Grader Minuter Sekunder"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
-msgid "S"
-msgstr "S"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
-msgid "N"
-msgstr "N"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
-msgid "W"
-msgstr "V"
-
-#: ../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 "ofullständig"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
-#, java-format
-msgid "Error: {0}"
-msgstr "Fel: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
-#, java-format
-msgid "Warning: {0}"
-msgstr "Varning: {0}"
-
-#: ../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"
@@ -2408,5 +2644,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:122
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "railway"
 msgstr "järnväg"
@@ -2428,4 +2664,62 @@
 msgstr[1] "{0} noder"
 
+#: ../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."
@@ -2573,5 +2867,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 "bakgrund"
@@ -2654,8 +2948,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
@@ -2667,7 +2961,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
@@ -2774,10 +3068,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 "Användarnamn"
 
 #: ../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 "Lösenord"
@@ -2874,22 +3168,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:146
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148
 msgid "File"
 msgstr "Arkiv"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150
 msgid "View"
 msgstr "Visa"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:149
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151
 msgid "Tools"
 msgstr "Verktyg"
 
-#: ../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 "Snabbval"
 
-#: ../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
@@ -2902,21 +3196,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 "Trådnätsvisning"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:218
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221
 msgid "Toggle Wireframe view"
 msgstr "Växla trådnätsvisning"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:244
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:247
 msgid "Full Screen"
 msgstr "Fullskärm"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:246
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:249
 msgid "Toggle Full Screen view"
 msgstr "Växla mellan fullskärmsläge"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:286
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:289
 msgid "Audio"
 msgstr "Ljud"
@@ -2988,6 +3282,6 @@
 msgstr "(inget objekt)"
 
-#: ../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 "lagret finns inte i listan."
@@ -2997,9 +3291,9 @@
 msgstr "Ansluter till OSM-servern"
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:104
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:105
 msgid "Error while parsing"
 msgstr "Fel vid tolkning"
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:107
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:108
 msgid "File not found"
 msgstr "Filen hittades inte"
@@ -3071,5 +3365,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 "Medlemmar"
@@ -3265,5 +3559,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
@@ -3345,5 +3639,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 ""
@@ -3382,5 +3676,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 ""
 
@@ -3434,5 +3728,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"
@@ -3536,5 +3830,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
@@ -3846,5 +4140,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 "Relationer"
@@ -3951,66 +4245,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 "Verkställ ändringar"
 
-#: ../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 "Grundläggande"
 
-#: ../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 "Innehas av"
 
-#: ../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 "Taggar (tomt värde tar bort taggen)"
 
-#: ../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 "Flytta uppåt"
 
-#: ../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 "Flytta vald medlem/valda medlemmar uppåt"
 
-#: ../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 "Lägg till vald"
 
-#: ../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 "Lägg till alla för närvarande valda objekt som medlemmar"
 
-#: ../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 "Ta bort det valda"
 
-#: ../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 "Ta bort alla för närvarande valda objekt från relationen"
 
-#: ../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 "Flytta nedåt"
 
-#: ../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 "Flytta vald medlem/valda medlemmar nedåt"
 
-#: ../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 "Ta bort medlemmen på den nuvarande tabellraden från denna relation"
 
-#: ../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 "Hämta medlemmar"
 
-#: ../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 "Hämta alla ofullständiga sträckor och noder i relationen"
@@ -4055,5 +4349,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
@@ -4074,9 +4368,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 "ja"
 
-#: ../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
@@ -4098,31 +4392,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 "nej"
 
-#: ../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 "Medlemmar: {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 "Relationsredigerare:{0}"
 
-#: ../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 "Konflikter upptäcktes under import."
 
-#: ../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 "Fel vid inläsning av serverns svar."
 
-#: ../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 "Kan inte ansluta till server."
+
+#: ../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
@@ -4188,17 +4485,17 @@
 msgstr "Datakällor och -typer"
 
-#: ../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 "Hämta som ett nytt lager"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:174
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:173
 msgid "Download Area"
 msgstr "Hämta område"
 
-#: ../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 "Hämtningsområdet är alltför stort; kommer troligen avvisas av servern."
 
-#: ../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 ""
@@ -4227,5 +4524,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 "Platser"
@@ -4272,21 +4569,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 "typ"
@@ -4326,15 +4623,4 @@
 msgid "Tile Numbers"
 msgstr "Rutnummer"
-
-#: ../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 ""
-"Du kan använda musen eller Ctrl+Piltangenter/./ för att zooma och panorera."
-
-#. 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 "Karta"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:98
@@ -4413,5 +4699,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)"
@@ -4527,14 +4813,14 @@
 msgstr "Wave-ljudfiler (*.wav)"
 
-#: ../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 "Ljudmarkörer från {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244
 msgid "Import images"
 msgstr "Importera bilder"
 
-#: ../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, "
@@ -4543,5 +4829,5 @@
 msgstr[1] "{0} spår, "
 
-#: ../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, "
@@ -4550,5 +4836,5 @@
 msgstr[1] "{0} rutter, "
 
-#: ../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"
@@ -4557,28 +4843,28 @@
 msgstr[1] "{0} sträckpunkter"
 
-#: ../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 "Namn: {0}"
 
-#: ../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 "Beskrivning: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347
 msgid "Timespan: "
 msgstr "Tidsomfång: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354
 msgid "Length: "
 msgstr "Längd: "
 
-#: ../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 "Omvandla till datalager"
 
-#: ../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 ""
@@ -4589,11 +4875,11 @@
 "skicka in spår, se här:"
 
-#: ../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
@@ -4603,29 +4889,29 @@
 msgstr "Omvandlad från:{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 "Hämta från OSM längs med detta spår"
 
-#: ../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 "Hämta allting inom:"
 
-#: ../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 "{0} meter"
 
-#: ../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 "Största tillåtna område per begäran:"
 
-#: ../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 "{0} km2"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:822
 #, java-format
 msgid ""
@@ -4636,9 +4922,9 @@
 "Önskar du<br>fortsätta?</html>"
 
-#: ../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 "Det finns inte något GPX-spår i lagret att knyta ljudet till."
 
-#: ../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 "
@@ -4648,5 +4934,5 @@
 "än dess slut uteslöts eller flyttades till början."
 
-#: ../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 "
@@ -4656,33 +4942,42 @@
 "kunna uppskattas med någon rimlighet uteslöts."
 
-#: ../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 "utanför hämtat område"
 
-#: ../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 "{0} består av:"
 
-#: ../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} raderad.)"
 
-#: ../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"
@@ -4690,21 +4985,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"
@@ -4851,5 +5146,5 @@
 "Förvalt värde är för närvarande okänt (inställningen har inte använts än)."
 
-#: ../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
@@ -4858,5 +5153,5 @@
 msgstr "Välj vilken rad du vill ändra."
 
-#: ../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
@@ -4864,5 +5159,5 @@
 msgstr "Nytt värde för {0}"
 
-#: ../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
@@ -4872,5 +5167,5 @@
 msgstr "Välj vilken rad du vill ta bort."
 
-#: ../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 "Ange ett nytt nyckel/värde-par"
@@ -5760,106 +6055,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 "Namn"
@@ -6338,6 +6633,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:36
-msgid "Login name (email) to the OSM account."
-msgstr "Användarnamn (epost) för OSM-kontot"
+msgid "Login name (e-mail) to the OSM account."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
@@ -6352,6 +6647,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
-msgid "OSM username (email)"
-msgstr "OSM-användarnamn (email)"
+msgid "OSM username (e-mail)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
@@ -6362,10 +6657,7 @@
 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 ""
-"<html>VARNING: Lösenordet lagras okryperat i inställningsfilen."
-"<br>Lösenordet skickas okryperat till servern, som en del av URL:en."
-"<br><b>Använd inte ett värdefullt lösenord.</b></html>"
 
 #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on
@@ -6688,6 +6980,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 "Ansluter till OSM-servern..."
@@ -6698,7 +6991,7 @@
 msgstr "Hämtar punkter {0} till {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 "Hämtar OSM-data..."
@@ -6763,15 +7056,14 @@
 msgstr "Import från NMEA misslyckades!"
 
-#: ../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 ""
@@ -6780,31 +7072,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 "Öppnar ändringssamling..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:351
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298
 msgid "Closing changeset..."
 msgstr "Stänger ändringssamling..."
 
-#: ../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 "Förbereder..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:381
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:326
 msgid "Uploading..."
 msgstr "Skickar in..."
@@ -6819,25 +7117,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 "Felaktigt lösenord eller användarnamn."
 
-#: ../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 "Varning: Lösenordet skickas okrypterat."
 
-#: ../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 "Spara användare och lösenord (okrypterat)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:89
 msgid "Enter Password"
 msgstr "Ange lösenord"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
 msgid "Login"
 msgstr "Logga in"
 
-#: ../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..."
@@ -6848,4 +7146,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."
@@ -6939,9 +7280,23 @@
 msgstr "Felformaterad nod-id"
 
-#: ../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 "Tar kontakt med servern..."
 
-#: ../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."
@@ -6949,17 +7304,9 @@
 "Kunde inte ansluta till osm-servern. Kontrollera din internetanslutning."
 
-#: ../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 ""
-"Servern svarade med internt fel. Försök med ett mindre område eller försök "
-"igen efter en stund."
-
-#: ../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 ""
 
@@ -6975,5 +7322,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 "Hämta insticksprogram"
@@ -7169,9 +7516,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 "Hämta saknade insticksmoduler"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:128
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:119
 #, java-format
 msgid ""
@@ -7184,6 +7531,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
@@ -7206,35 +7553,35 @@
 msgstr "okänd"
 
-#: ../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}: Version {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 "Insticksmodul som medföljer JOSM"
 
-#: ../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 "Fel vid inläsning av informationsfil för insticksmodul: {0}"
 
-#: ../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 "Detta är slutet av inspelningen"
 
-#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:329
+#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:340
 msgid "Error playing sound"
 msgstr "Fel vid uppspelning av ljud"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
 msgid "Do nothing"
 msgstr "Gör ingenting"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
 msgid "Report Bug"
 msgstr "Rapportera en bugg"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:52
 msgid ""
 "An unexpected exception occurred.\n"
@@ -7248,14 +7595,14 @@
 "lämna in en felrapport."
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55
 msgid "Unexpected Exception"
 msgstr "Oväntat undantag"
 
-#: ../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 "Lämna in en rapport på {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 ""
@@ -7263,5 +7610,5 @@
 "möjligt)!"
 
-#: ../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 "
@@ -7271,9 +7618,9 @@
 "versionen av JOSM och alla insticksmoduler."
 
-#: ../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 "Följande information måste finnas med:"
 
-#: ../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 "(Texten finns redan i urklipp.)"
@@ -7358,5 +7705,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 "Beskrivning"
@@ -7739,5 +8086,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 ""
@@ -7771,5 +8118,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"
@@ -7792,5 +8138,5 @@
 msgstr "Lambertzon 1 cachefil (.4)"
 
-#: ../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
@@ -7883,6 +8229,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/"
@@ -7964,6 +8310,6 @@
 msgstr "Lägg \"source=...\" till objekt?"
 
-#: ../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
@@ -7971,11 +8317,11 @@
 msgstr "Hämtar {0}"
 
-#: ../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 "Kontaktar WMS-servern..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:157
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:158
 msgid "Create buildings"
 msgstr "Skapa byggnader"
@@ -7992,13 +8338,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 "Extrahera den gräns som passar bäst..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:126
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:127
 msgid "Create boundary"
 msgstr "Skapa gräns"
@@ -8019,5 +8365,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 "Hämta bild från den franska Cadastre-WMS:en"
 
@@ -8110,5 +8456,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
@@ -8116,59 +8462,28 @@
 msgstr "Tomt lager"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:176
 #, java-format
 msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr "WMS-lager ({0}), {1} ruta/rutor inlästa"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:183
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:178
 msgid "Is not vectorized."
 msgstr "Är inte vektoriserad"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:179
 #, java-format
 msgid "Raster center: {0}"
 msgstr "Rastercenter: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181
 msgid "Is vectorized."
 msgstr "Är vektoriserad"
 
-#: ../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 "Spara WMS-lagret till en fil"
-
-#: ../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 "Hämta WMS-lager från en fil"
-
-#: ../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 "WMS-filversion som ej stöds; funnen {0}, förväntad {1}"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:325
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:335
-msgid "File Format Error"
-msgstr "Fel filformat"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:481
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:401
 #, java-format
 msgid ""
@@ -8179,14 +8494,14 @@
 "Skapa en ny."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:482
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402
 msgid "Cache Format Error"
 msgstr "Cacheformatsfel"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:497
-#, java-format
-msgid "Lambert zone {0} in cache  incompatible with current Lambert zone {1}"
-msgstr "Lambertzon {0} i cache inkompatibel med nuvarande Lambertzon {1}"
-
-#: ../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 ""
@@ -8281,11 +8596,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 "Importera sträckning från GPX-lager"
 
 #: ../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 "Glöm existerande sträckning"
@@ -8295,5 +8610,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 "Inget GPX-datalager kunde hittas."
@@ -8584,4 +8899,8 @@
 msgid "Lakewalker trace"
 msgstr "Spår från lakewalker"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:10
+msgid "An unknown error has occurred"
+msgstr ""
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
@@ -8904,42 +9223,42 @@
 msgstr "LiveGPS"
 
-#: ../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 "Uppmätta värden."
 
-#: ../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 "Öppna mätlistan."
 
-#: ../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 "Återställ"
 
-#: ../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 "Återställ nuvarande mätresultat och ta bort mätsökvägen."
 
-#: ../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 "Mätsökvägens längd"
 
-#: ../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 "Urvalets längd"
 
-#: ../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 "Urvalets area"
 
-#: ../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 "Vinkel"
 
-#: ../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 "Vinkel mellan två valda noder"
 
-#: ../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 "Lager för att utföra mätningar"
@@ -8999,6 +9318,6 @@
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
-msgid "Open the OpenStreetBugs window and activate the automatic download"
-msgstr "Öppna OpenStreetBugs-listan och aktiverar automatisk hämtning"
+msgid "Opens the OpenStreetBugs window and activates the automatic download"
+msgstr ""
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:123
@@ -9075,5 +9394,5 @@
 msgstr "Osmarender"
 
-#: ../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 "
@@ -9083,9 +9402,9 @@
 "kartinställningssidan av inställningar."
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:123
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:127
 msgid "osmarender options"
 msgstr "inställningar för osmarender"
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:124
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:128
 msgid "Firefox executable"
 msgstr "Firefox-applikationen"
@@ -9520,5 +9839,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 "Gatunamn"
@@ -9614,6 +9933,6 @@
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:195
-msgid "No intersections found. Nothing was changed."
-msgstr "Inga tvärsnitt hittades. Ingenting har ändrats."
+msgid "No intersection found. Nothing was changed."
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:217
@@ -10509,42 +10828,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 ""
-"Du kan lägga till, ändra och ta bort WMS-poster med hjälp av "
-"inställningsfliken för WMSplugin - dessa kommer att synas i WMS-menyn.\n"
-"\n"
-"Du kan också göra dessa ändringar manuellt under avancerade inställningar, "
-"enligt följande mall:\n"
-"wmsplugin.url.1.name=Landsat\n"
-"wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n"
-"wmsplugin.url.2.name=NPE Maps... etc\n"
-"\n"
-"Exempel på fullständigt WMS URL-inmatningsformat (landsat)\n"
-"http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n"
-"layers=global_mosaic&styles=&srs=EPSG:4326&\n"
-"format=image/jpeg \n"
-"\n"
-"Vad gäller Metacartas Kartkorrigerare http://labs.metacarta.com/rectifier/ , "
-"så behöver du enbart ange relevant 'id'.\n"
-"För att lägga till en menypost för en korrigerad karta från Metacarta, skapa "
-"manuellt en url som i följande exempel och ersätt 73 med id för din bild: \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"
-"Observera: Se till att bilden får användas enligt copyright-regler, om du är "
-"tveksam så använd inte den."
-
-#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:54
+
+#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:53
 msgid "WMS Plugin Help"
 msgstr "Hjälp om WMS-insticksmodulen"
@@ -10603,5 +10898,5 @@
 msgstr "Justera valt WMS-lagers läge"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113
 #, java-format
 msgid ""
@@ -10644,4 +10939,29 @@
 msgid "Alpha channel"
 msgstr "Alfakanal"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
+msgid "Save WMS layer to file"
+msgstr "Spara WMS-lagret till en fil"
+
+#: ../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 "Hämta WMS-lager från en fil"
+
+#: ../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 "WMS-filversion som ej stöds; funnen {0}, förväntad {1}"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:335
+msgid "File Format Error"
+msgstr "Fel filformat"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:163
@@ -10735,4 +11055,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 ""
@@ -10749,5 +11074,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 ""
 
@@ -11031,5 +11356,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 "Referens"
@@ -11531,5 +11856,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 "Bredd (meter)"
@@ -11998,7 +12323,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 "Typ"
@@ -12614,10 +12939,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 "Operatör"
@@ -12829,7 +13154,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 "Höjd"
@@ -13761,5 +14086,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 "Avgift"
@@ -13895,5 +14220,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 "Referens (spårnummer)"
@@ -13901,5 +14226,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 "Område"
@@ -13951,11 +14276,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 "VIndskydd"
+
+#. item "Public Transport/Bus Stop" check "Shelter"
 #. </optional>
-#: build/trans_presets.java:1503
+#: build/trans_presets.java:1504
 msgid "Bus Platform"
 msgstr "Bussplattform"
 
 #. item
-#: build/trans_presets.java:1504
+#: build/trans_presets.java:1505
 msgid "Edit Bus Platform"
 msgstr "Redigera en bussplattform"
@@ -13963,5 +14298,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1512
+#: build/trans_presets.java:1513
 msgid "Taxi"
 msgstr "Taxi"
@@ -13969,5 +14304,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 "Redigera en taxistation"
@@ -13975,5 +14310,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1519
+#: build/trans_presets.java:1520
 msgid "Airport"
 msgstr "Flygplats"
@@ -13981,15 +14316,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 "IATA"
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1527
+#: build/trans_presets.java:1528
 msgid "ICAO"
 msgstr "ICAO"
@@ -13998,5 +14333,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1532
+#: build/trans_presets.java:1533
 msgid "Accomodation"
 msgstr "Logi"
@@ -14008,5 +14343,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 "Hotell"
@@ -14015,15 +14350,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 "Redigera ett hotell"
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1539
+#: build/trans_presets.java:1540
 msgid "Stars"
 msgstr "Stjärnor"
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1541
+#: build/trans_presets.java:1542
 msgid "Motel"
 msgstr "Motell"
@@ -14031,20 +14366,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 "Redigera ett motell"
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1547
+#: build/trans_presets.java:1548
 msgid "Guest House"
 msgstr "Pensionat"
 
 #. item
-#: build/trans_presets.java:1548
+#: build/trans_presets.java:1549
 msgid "Edit Guest House"
 msgstr "Redigera pensionat"
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1552
+#: build/trans_presets.java:1553
 msgid "Chalet"
 msgstr "Fäbod"
@@ -14052,10 +14387,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 "Redigera fäbod"
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1558
+#: build/trans_presets.java:1559
 msgid "Hostel"
 msgstr "Vandrarhem"
@@ -14063,30 +14398,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 "Redigera ett vandrarhem"
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1564
+#: build/trans_presets.java:1565
 msgid "Alpine Hut"
 msgstr "Alphydda"
 
 #. item
-#: build/trans_presets.java:1565
+#: build/trans_presets.java:1566
 msgid "Edit Alpine Hut"
 msgstr "Redigera alphydda"
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1570
+#: build/trans_presets.java:1571
 msgid "Caravan Site"
 msgstr "Husvagnscamping"
 
 #. item
-#: build/trans_presets.java:1571
+#: build/trans_presets.java:1572
 msgid "Edit Caravan Site"
 msgstr "Redigera en husvagnscamping"
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1575
+#: build/trans_presets.java:1576
 msgid "Camping Site"
 msgstr "Campingplats"
@@ -14094,10 +14429,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 "Redigera en campingplats"
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1582
+#: build/trans_presets.java:1583
 msgid "Food+Drinks"
 msgstr "Mat+Dryck"
@@ -14108,5 +14443,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 "Restaurang"
@@ -14114,5 +14449,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 "Redigera en restaurang"
@@ -14120,5 +14455,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 "Kök"
@@ -14126,61 +14461,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 "italienskt"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "chinese"
 msgstr "kinesiskt"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "burger"
 msgstr "hamburgare"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "greek"
 msgstr "grekiskt"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "german"
 msgstr "tyskt"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "indian"
 msgstr "indiskt"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "regional"
 msgstr "lokalt"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "turkish"
 msgstr "turkiskt"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "asian"
 msgstr "asiatiskt"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "thai"
 msgstr "thailändskt"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "mexican"
 msgstr "mexikanskt"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "japanese"
 msgstr "japanskt"
 
-#: build/trans_presets.java:1590
+#: build/trans_presets.java:1591
 msgid "Fast Food"
 msgstr "Snabbmat"
@@ -14188,9 +14523,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 "Redigera en snabbmatsrestaurang"
 
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1598
 msgid "Cafe"
 msgstr "Kafé"
@@ -14198,10 +14533,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 "Redigera kafé"
 
 #. item "Food+Drinks/Cafe" text "Name"
-#: build/trans_presets.java:1603
+#: build/trans_presets.java:1604
 msgid "Pub"
 msgstr "Pub"
@@ -14209,20 +14544,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 "Redigera pub"
 
 #. item "Food+Drinks/Pub" text "Name"
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1610
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item
-#: build/trans_presets.java:1610
+#: build/trans_presets.java:1611
 msgid "Edit Biergarten"
 msgstr "Redigera Biergarten"
 
 #. item "Food+Drinks/Biergarten" text "Name"
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1615
 msgid "Bar"
 msgstr ""
@@ -14230,10 +14565,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 "Nattklubb"
@@ -14241,20 +14576,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 "Redigera nattklubb"
 
 #. item "Food+Drinks/Nightclub" text "Name"
-#: build/trans_presets.java:1627
+#: build/trans_presets.java:1628
 msgid "Tourism"
 msgstr "Turism"
 
 #. group "Tourism"
-#: build/trans_presets.java:1628
+#: build/trans_presets.java:1629
 msgid "Attraction"
 msgstr "Sevärdhet"
 
 #. item
-#: build/trans_presets.java:1629
+#: build/trans_presets.java:1630
 msgid "Edit Attraction"
 msgstr "Redigera sevärdhet"
@@ -14263,11 +14598,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 "Öppettider"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1634
+#: build/trans_presets.java:1635
 msgid "Museum"
 msgstr "Museum"
@@ -14275,10 +14610,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 "Redigera museum"
 
 #. item "Tourism/Museum" text "Name"
-#: build/trans_presets.java:1640
+#: build/trans_presets.java:1641
 msgid "Zoo"
 msgstr "Zoo"
@@ -14287,10 +14622,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 "Redigera zoo"
 
 #. item "Tourism/Zoo" text "Name"
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1648
 msgid "Viewpoint"
 msgstr "Utsiktsplats"
@@ -14298,25 +14633,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 "Redigera utsiktsplats"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1652
+#: build/trans_presets.java:1653
 msgid "Look-Out Tower"
 msgstr "Utsiktstorn"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1654
+#: build/trans_presets.java:1655
 msgid "Theme Park"
 msgstr "Nöjespark"
 
 #. item
-#: build/trans_presets.java:1655
+#: build/trans_presets.java:1656
 msgid "Edit Theme Park"
 msgstr "Redigera en nöjespark"
 
 #. item "Tourism/Theme Park" text "Name"
-#: build/trans_presets.java:1659
+#: build/trans_presets.java:1660
 msgid "Artwork"
 msgstr "Konst"
@@ -14324,5 +14659,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 "Redigera konstverk"
@@ -14330,5 +14665,5 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1667
 msgid "Information Office"
 msgstr ""
@@ -14336,83 +14671,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 "Karta"
+
 #. 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 "karta"
 
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1679
 msgid "citymap"
 msgstr "stadskarta"
 
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1679
 msgid "hikingmap"
 msgstr "vandringskarta"
 
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1679
 msgid "bicyclemap"
 msgstr "cykelkarta"
 
 #. 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 "historiskt"
 
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1686
 msgid "nature"
 msgstr "naturfenomen"
 
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1686
 msgid "wildlife"
 msgstr "djurliv"
 
 #. 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 "VIndskydd"
-
-#. item
-#: build/trans_presets.java:1703
+#. item
+#: build/trans_presets.java:1704
 msgid "Edit Shelter"
 msgstr "Redigera vindskydd"
@@ -14420,25 +14752,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 "Eldstad"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1709
 msgid "Picnic Site"
 msgstr "Picknickplats"
 
 #. item
-#: build/trans_presets.java:1709
+#: build/trans_presets.java:1710
 msgid "Edit Picnic Site"
 msgstr "Redigera picknickplats"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1716
 msgid "Historic Places"
 msgstr "Historiska platser"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1716
+#: build/trans_presets.java:1717
 msgid "Castle"
 msgstr "Slott"
@@ -14447,20 +14779,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 "Redigera slott"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1724
 msgid "Ruins"
 msgstr "Ruiner"
 
 #. item
-#: build/trans_presets.java:1724
+#: build/trans_presets.java:1725
 msgid "Edit Ruins"
 msgstr "Redigera ruiner"
 
 #. item "Historic Places/Ruins" text "Name"
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1729
 msgid "Archaeological Site"
 msgstr "Utgrävningsplats"
@@ -14469,10 +14801,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 "Redigera utgrävningsplats"
 
 #. item "Historic Places/Archaeological Site" text "Name"
-#: build/trans_presets.java:1735
+#: build/trans_presets.java:1736
 msgid "Battlefield"
 msgstr "Krigsskådeplats"
@@ -14480,5 +14812,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 "Redigera krigsskådeplats"
@@ -14486,15 +14818,15 @@
 #. item "Historic Places/Battlefield" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1743
 msgid "Monument"
 msgstr "Monument"
 
 #. item
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1744
 msgid "Edit Monument"
 msgstr "Redigera monument"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1748
 msgid "Memorial"
 msgstr "Minnesmärke"
@@ -14502,45 +14834,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 "Redigera minnesmärke"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1753
+#: build/trans_presets.java:1754
 msgid "Wayside Cross"
 msgstr "Vägkors"
 
 #. item
-#: build/trans_presets.java:1754
+#: build/trans_presets.java:1755
 msgid "Edit Wayside Cross"
 msgstr "Redigera ett vägkors"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1758
+#: build/trans_presets.java:1759
 msgid "Wayside Shrine"
 msgstr "Vägaltare"
 
 #. item
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1760
 msgid "Edit Wayside Shrine"
 msgstr "Redigera ett vägaltare"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1765
 msgid "Leisure"
 msgstr "Nöje"
 
 #. group "Leisure"
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1766
 msgid "Water Park"
 msgstr "Badanläggning"
 
 #. item
-#: build/trans_presets.java:1766
+#: build/trans_presets.java:1767
 msgid "Edit Water Park"
 msgstr "Redigera badanläggning"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1770
+#: build/trans_presets.java:1771
 msgid "Playground"
 msgstr "Lekplats"
@@ -14548,15 +14880,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 "Redigera lekplats"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1776
+#: build/trans_presets.java:1777
 msgid "Fishing"
 msgstr "Fiske"
 
 #. item
-#: build/trans_presets.java:1777
+#: build/trans_presets.java:1778
 msgid "Edit Fishing"
 msgstr "Redigera fiske"
@@ -14564,15 +14896,15 @@
 #. item "Leisure/Fishing" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1783
+#: build/trans_presets.java:1784
 msgid "Sport Facilities"
 msgstr "Sportfaciliteteter"
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1784
+#: build/trans_presets.java:1785
 msgid "Stadium"
 msgstr "Stadion"
 
 #. item
-#: build/trans_presets.java:1785
+#: build/trans_presets.java:1786
 msgid "Edit Stadium"
 msgstr "Redigera stadion"
@@ -14586,6 +14918,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 "välj sport:"
@@ -14961,6 +15293,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
@@ -14993,227 +15325,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 "flera"
 
-#: 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 "bågskytte"
 
-#: 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 "friidrott"
 
-#: 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 "australisk fotboll"
 
-#: 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 "baseball"
 
-#: 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 "basket"
 
-#: 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 "boule"
 
-#: 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 "kanot"
 
-#: 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 "klättring"
 
-#: 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 "cricket"
 
-#: 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 "kricket_nät"
 
-#: 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 "krocket"
 
-#: 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 "cykling"
 
-#: 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 "hundracing"
 
-#: 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 "ridsport"
 
-#: 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 "amerikansk fotboll"
 
-#: 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 "golf"
 
-#: 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 "gymnastik"
 
-#: 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 "ishockey"
 
-#: 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 "hästkapplöpning"
 
-#: 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 "motorsport"
 
-#: 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 "pelota"
 
-#: 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 "rackets"
 
-#: 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 "rugby"
 
-#: 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 "skytte"
 
-#: 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 "skateboard"
 
-#: 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 "skridskoåkning"
 
-#: 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 "skidåkning"
 
-#: 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 "fotboll"
 
-#: 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 "simning"
 
-#: 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 "bordtennis"
 
-#: 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 "tennis"
 
-#: build/trans_presets.java:1793
+#: build/trans_presets.java:1794
 msgid "Sports Centre"
 msgstr "Sporthall"
 
 #. item
-#: build/trans_presets.java:1794
+#: build/trans_presets.java:1795
 msgid "Edit Sports Centre"
 msgstr "Redigera sporthall"
 
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1803
 msgid "Pitch"
 msgstr "Plan"
 
 #. item
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1804
 msgid "Edit Pitch"
 msgstr "Redigera plan"
 
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1812
 msgid "Racetrack"
 msgstr "Bana"
 
 #. item
-#: build/trans_presets.java:1812
+#: build/trans_presets.java:1813
 msgid "Edit Racetrack"
 msgstr "Redigera bana"
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1821
 msgid "Golf Course"
 msgstr "Golfbana"
 
 #. item
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1822
 msgid "Edit Golf Course"
 msgstr "Redigera golfbana"
 
 #. item "Sport Facilities/Golf Course" text "Name"
-#: build/trans_presets.java:1825
+#: build/trans_presets.java:1826
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item
-#: build/trans_presets.java:1826
+#: build/trans_presets.java:1827
 msgid "Edit Miniature Golf"
 msgstr "Redigera minigolfbana"
 
 #. item "Sport Facilities/Miniature Golf" text "Name"
-#: build/trans_presets.java:1831
+#: build/trans_presets.java:1832
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1833
 msgid "Multi"
 msgstr "Flera"
 
 #. item
-#: build/trans_presets.java:1833
+#: build/trans_presets.java:1834
 msgid "Edit Multi"
 msgstr "Redigera flersportsfacilitet"
@@ -15252,191 +15584,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 "plan"
 
-#: 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 "sporthall"
 
-#: 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 "stadion"
 
-#: 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 "Friidrott"
 
 #. item
-#: build/trans_presets.java:1845
+#: build/trans_presets.java:1846
 msgid "Edit Athletics"
 msgstr "Redigera friidrott"
 
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1851
 msgid "Archery"
 msgstr "Bågskytte"
 
 #. item
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:1852
 msgid "Edit Archery"
 msgstr "Redigera bågskytte"
 
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:1857
 msgid "Climbing"
 msgstr "Klättring"
 
 #. item
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:1858
 msgid "Edit Climbing"
 msgstr "Redigera klättring"
 
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1863
 msgid "Canoeing"
 msgstr "Kanotpaddling"
 
 #. item
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:1864
 msgid "Edit Canoeing"
 msgstr "Redigera kanotpaddling"
 
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:1869
 msgid "Cycling"
 msgstr "Cykling"
 
 #. item
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1870
 msgid "Edit Cycling"
 msgstr "Redigera cykling"
 
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1875
 msgid "Dog Racing"
 msgstr "Hundkapplöpning"
 
 #. item
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1876
 msgid "Edit Dog Racing"
 msgstr "Redigera hundkapplöpning"
 
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1881
 msgid "Equestrian"
 msgstr "Ridsport"
 
 #. item
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:1882
 msgid "Edit Equestrian"
 msgstr "Redigera ridsport"
 
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1887
 msgid "Horse Racing"
 msgstr "Hästkapplöpning"
 
 #. item
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1888
 msgid "Edit Horse Racing"
 msgstr "Redigera hästkapplöpning"
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:1893
 msgid "Gymnastics"
 msgstr "Gymnastik"
 
 #. item
-#: build/trans_presets.java:1893
+#: build/trans_presets.java:1894
 msgid "Edit Gymnastics"
 msgstr "Redigera gymnastik"
 
-#: build/trans_presets.java:1898
+#: build/trans_presets.java:1899
 msgid "Motor Sports"
 msgstr "Motorsport"
 
 #. item
-#: build/trans_presets.java:1899
+#: build/trans_presets.java:1900
 msgid "Edit Motor Sports"
 msgstr "Redigera motorsport"
 
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:1905
 msgid "Skating"
 msgstr "Skridskoåkning"
 
 #. item
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:1906
 msgid "Edit Skating"
 msgstr "Redigera skridskoåkning"
 
-#: build/trans_presets.java:1910
+#: build/trans_presets.java:1911
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:1912
 msgid "Edit Skateboard"
 msgstr "Redigera skateboard"
 
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:1917
 msgid "Swimming"
 msgstr "Simning"
 
 #. item
-#: build/trans_presets.java:1917
+#: build/trans_presets.java:1918
 msgid "Edit Swimming"
 msgstr "Redigera simning"
 
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:1923
 msgid "Skiing"
 msgstr "Skidåkning"
@@ -15444,56 +15776,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 "Redigera skidåkning"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1928
 msgid "Piste type"
 msgstr "Skidspårstyp"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1928
 msgid "downhill"
 msgstr "utförsåkning"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1928
 msgid "nordic"
 msgstr "längdskidåkning"
 
-#: 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 "Svårighetsgrad"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:1929
 msgid "novice"
 msgstr "nybörjare"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:1929
 msgid "easy"
 msgstr "lätt"
 
-#: 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 "expert"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:1929
 msgid "freeride"
 msgstr "ospårat"
 
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1932
 msgid "Shooting"
 msgstr "Skytte"
@@ -15501,178 +15833,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 "Redigera skytte"
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1940
 msgid "Sport (Ball)"
 msgstr "Bollsport"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1941
 msgid "Soccer"
 msgstr "Fotboll"
 
 #. item
-#: build/trans_presets.java:1941
+#: build/trans_presets.java:1942
 msgid "Edit Soccer"
 msgstr "Redigera fotboll"
 
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:1947
 msgid "Football"
 msgstr "Amerikansk fotboll"
 
 #. item
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:1948
 msgid "Edit Football"
 msgstr "Redigera amerikansk fotboll"
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1953
 msgid "Australian Football"
 msgstr "Australisk fotboll"
 
 #. item
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:1954
 msgid "Edit Australian Football"
 msgstr "Redigera australisk fotboll"
 
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:1959
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:1960
 msgid "Edit Baseball"
 msgstr "Redigera baseball"
 
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:1965
 msgid "Basketball"
 msgstr "Basket"
 
 #. item
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:1966
 msgid "Edit Basketball"
 msgstr "Redigera basket"
 
-#: 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 "Redigera golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1975
 msgid "golf_course"
 msgstr "golf_bana"
 
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:1977
 msgid "Boule"
 msgstr "Boule"
 
 #. item
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:1978
 msgid "Edit Boule"
 msgstr "Redigera boule"
 
-#: 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 "Cricket"
 
 #. item
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:1990
 msgid "Edit Cricket"
 msgstr "Redigera cricket"
 
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:1995
 msgid "Cricket Nets"
 msgstr "Cricketnät"
 
 #. item
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:1996
 msgid "Edit Cricket Nets"
 msgstr "Redigera cricketnät"
 
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:2001
 msgid "Croquet"
 msgstr "Krocket"
 
 #. item
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:2002
 msgid "Edit Croquet"
 msgstr "Redigera krocket"
 
-#: build/trans_presets.java:2006
+#: build/trans_presets.java:2007
 msgid "Hockey"
 msgstr "Ishockey"
 
 #. item
-#: build/trans_presets.java:2007
+#: build/trans_presets.java:2008
 msgid "Edit Hockey"
 msgstr "Redigera ishockey"
 
-#: build/trans_presets.java:2012
+#: build/trans_presets.java:2013
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2014
 msgid "Edit Pelota"
 msgstr "Redigera pelota"
 
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2019
 msgid "Racquet"
 msgstr "Rackets"
 
 #. item
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2020
 msgid "Edit Racquet"
 msgstr "Redigera rackets"
 
-#: build/trans_presets.java:2024
+#: build/trans_presets.java:2025
 msgid "Rugby"
 msgstr "Rugby"
 
 #. item
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2026
 msgid "Edit Rugby"
 msgstr "Redigera rugby"
 
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:2031
 msgid "Table Tennis"
 msgstr "Bordtennis"
 
 #. item
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2032
 msgid "Edit Table Tennis"
 msgstr "Redigera bordtennis"
 
-#: 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 "Redigera tennis"
 
 #. <separator/>
-#: build/trans_presets.java:2044
+#: build/trans_presets.java:2045
 msgid "Buildings"
 msgstr "Byggnader"
 
 #. group "Buildings"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2046
 msgid "Building"
 msgstr "Byggnad"
@@ -15680,5 +16012,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2049
 msgid "Public Building"
 msgstr "Offentlig byggnad"
@@ -15686,10 +16018,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 "Redigera offentlig byggnad"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2055
 msgid "Town hall"
 msgstr "Stadshus"
@@ -15697,10 +16029,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 "Redigera stadshus"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2061
 msgid "Embassy"
 msgstr "Ambassad"
@@ -15708,10 +16040,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 "Redigera ambassad"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2066
+#: build/trans_presets.java:2067
 msgid "Courthouse"
 msgstr "Domstol"
@@ -15720,10 +16052,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 "Redigera domstol"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2074
 msgid "Prison"
 msgstr "Fängelse"
@@ -15732,10 +16064,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 "Redigera fängelse"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2080
+#: build/trans_presets.java:2081
 msgid "Police"
 msgstr "Polisstation"
@@ -15745,10 +16077,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 "Redigera polisstation"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2089
 msgid "Fire Station"
 msgstr "Brandstation"
@@ -15757,10 +16089,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 "Redigera brandstation"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2096
 msgid "Post Office"
 msgstr "Postkontor"
@@ -15768,5 +16100,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 "Redigera postkontor"
@@ -15774,15 +16106,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2103
 msgid "Kindergarten"
 msgstr "Barndaghem"
 
 #. item
-#: build/trans_presets.java:2103
+#: build/trans_presets.java:2104
 msgid "Edit Kindergarten"
 msgstr "Redigera barndaghem"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2108
 msgid "School"
 msgstr "Skola"
@@ -15790,10 +16122,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 "Redigera skola"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2114
 msgid "University"
 msgstr "Högskola/universitet"
@@ -15801,10 +16133,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 "Redigera högskola/universitet"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2120
 msgid "College"
 msgstr "Högskola"
@@ -15812,5 +16144,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 "Redigera högskola"
@@ -15818,5 +16150,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2126
+#: build/trans_presets.java:2127
 msgid "Cinema"
 msgstr "Biograf"
@@ -15825,10 +16157,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 "Redigera biograf"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2133
+#: build/trans_presets.java:2134
 msgid "Library"
 msgstr "Bibliotek"
@@ -15837,10 +16169,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 "Redigera bibliotek"
 
 #. item "Buildings/Library" text "Name"
-#: build/trans_presets.java:2140
+#: build/trans_presets.java:2141
 msgid "Arts Centre"
 msgstr "Konstcenter"
@@ -15848,10 +16180,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 "Redigera konstcenter"
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2146
+#: build/trans_presets.java:2147
 msgid "Theatre"
 msgstr "Teater"
@@ -15860,10 +16192,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 "Redigera teater"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2154
 msgid "Place of Worship"
 msgstr "Religiös helgedom"
@@ -15873,5 +16205,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 "Redigera religiös helgedom"
@@ -15880,6 +16212,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 "Religion"
@@ -15888,66 +16220,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 "bahai"
 
-#: 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 "buddism"
 
-#: 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 "kristendom"
 
-#: 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 "hinduism"
 
-#: 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 "jain"
 
-#: 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 "judendom"
 
-#: 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 "islam"
 
-#: 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 ""
 
-#: 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 "daoism"
 
-#: 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 "zoroastrianism"
 
-#: 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 "Samfund"
@@ -15956,81 +16288,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 "anglikaner"
 
-#: 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 "baptister"
 
-#: 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 "katoliker"
 
-#: 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 "evangelister"
 
-#: 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 "jehovas_vittnen"
 
-#: 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 "luteraner"
 
-#: 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 "metodister"
 
-#: 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 "mormoner"
 
-#: 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 "ortodoxa"
 
-#: 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 "pinstvänner"
 
-#: 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 "presbytarianer"
 
-#: 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 "protestanter"
 
-#: 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 "kväkare"
 
-#: 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 "shiamuslimer"
 
-#: 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 "sunnimuslimer"
 
 #. <separator/>
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2165
 msgid "Addresses"
 msgstr "Adresser"
@@ -16039,5 +16371,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 "Redigera adressinformation"
@@ -16045,5 +16377,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2169
+#: build/trans_presets.java:2170
 msgid "House number"
 msgstr "Husnummer"
@@ -16051,20 +16383,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2172
 msgid "House name"
 msgstr "Husnamn"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2174
 msgid "City name"
 msgstr "Stadsnamn"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2174
+#: build/trans_presets.java:2175
 msgid "Post code"
 msgstr "Postnummer"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2176
 msgid "Country code"
 msgstr "Landskod"
@@ -16072,5 +16404,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2179
 msgid "Address Interpolation"
 msgstr "Adressinterpolation"
@@ -16079,5 +16411,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 "Redigera adressinterpolation"
@@ -16085,71 +16417,71 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2184
 msgid "Numbering scheme"
 msgstr "Numreringsschema"
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2184
 msgid "odd"
 msgstr "udda"
 
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2184
 msgid "even"
 msgstr "jämn"
 
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2184
 msgid "all"
 msgstr "alla"
 
-#: 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 "Byggnadsverk"
 
 #. group "Man Made"
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2188
 msgid "Works"
 msgstr "Fabrik"
 
 #. item
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2189
 msgid "Edit Works"
 msgstr "Redigera fabriksbyggnad"
 
 #. 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 "Redigera torn"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2198
 msgid "Water Tower"
 msgstr "Vattentorn"
 
 #. item
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2199
 msgid "Edit Water Tower"
 msgstr "Redigera vattentorn"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2203
 msgid "Gasometer"
 msgstr "Gasklocka"
 
 #. item
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2204
 msgid "Edit Gasometer"
 msgstr "Redigera gasklocka"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2207
+#: build/trans_presets.java:2208
 msgid "Lighthouse"
 msgstr "Fyrtorn"
@@ -16157,10 +16489,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 "Fyrtorn"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2214
 msgid "Windmill"
 msgstr "Väderkvarn"
@@ -16168,10 +16500,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 "Redigera väderkvarn"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2220
 msgid "Pipeline"
 msgstr "Rörledning"
@@ -16179,10 +16511,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 "Redigera rörledning"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2225
+#: build/trans_presets.java:2226
 msgid "Wastewater Plant"
 msgstr "Reningsverk"
@@ -16192,10 +16524,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 "Redigera reningsverk"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2233
+#: build/trans_presets.java:2234
 msgid "Crane"
 msgstr "Kran"
@@ -16203,10 +16535,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 "Redigera kran"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2239
+#: build/trans_presets.java:2240
 msgid "Beacon"
 msgstr "Fyrbåk"
@@ -16214,10 +16546,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 "Redigera fyrbåk"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2245
+#: build/trans_presets.java:2246
 msgid "Survey Point"
 msgstr "Mätpunkt"
@@ -16225,10 +16557,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 "Redigera mätpunkt"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2252
 msgid "Surveillance"
 msgstr "Övervakning"
@@ -16236,5 +16568,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 "Redigera övervakningskamera"
@@ -16242,5 +16574,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2258
+#: build/trans_presets.java:2259
 msgid "Power Generator"
 msgstr "Kraftverk"
@@ -16250,39 +16582,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 "Redigera ett kraftverk"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "wind"
 msgstr "vindkraft"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "hydro"
 msgstr "vattenkraft"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "fossil"
 msgstr "fossila bränslen"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "nuclear"
 msgstr "kärnkraft"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "coal"
 msgstr "kolkraft"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "photovoltaic"
 msgstr "solkraft"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "gas"
 msgstr "naturgas"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2268
 msgid "Power Station"
 msgstr "Kraftstation"
@@ -16291,10 +16623,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 "Redigera en kraftstation"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2274
+#: build/trans_presets.java:2275
 msgid "Power Sub Station"
 msgstr "Transformatorstation"
@@ -16303,5 +16635,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 "Redigera en transformatorstation"
@@ -16309,10 +16641,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 "Kraftledningsmast"
@@ -16323,5 +16655,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 "Redigera en kraftledningsmast"
@@ -16329,5 +16661,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 "Kraftledning"
@@ -16336,25 +16668,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 "Redigera en kraftledning"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2298
 msgid "Voltage"
 msgstr "Spänning"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2299
 msgid "Amount of Wires"
 msgstr "Antal kablar"
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2301
+#: build/trans_presets.java:2302
 msgid "Amenities"
 msgstr "Inrättningar"
 
 #. group "Amenities"
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2303
 msgid "Toilets"
 msgstr "Toaletter"
@@ -16362,20 +16694,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 "Referensnummer"
 
 #. 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 "Anteckning"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2312
 msgid "Post Box"
 msgstr "Brevlåda"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2317
 msgid "Telephone"
 msgstr "Telefon"
@@ -16384,5 +16716,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 "Redigera en telefon"
@@ -16390,5 +16722,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 "Mynt"
@@ -16396,5 +16728,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 "Anteckningar"
@@ -16402,5 +16734,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 "Betalkort"
@@ -16408,5 +16740,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 "Kontokort"
@@ -16414,15 +16746,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 "Kreditkort"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2328
 msgid "Telephone cards"
 msgstr "Telefonkort"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2330
 msgid "Recycling"
 msgstr "Återvinning"
@@ -16431,5 +16763,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 "Redigera en återvinningsstation"
@@ -16437,35 +16769,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 "Batterier"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2336
 msgid "Cans"
 msgstr "Burkar"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2337
 msgid "Clothes"
 msgstr "Kläder"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2338
 msgid "Glass"
 msgstr "Glas"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2339
 msgid "Paper"
 msgstr "Papper"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2340
 msgid "Scrap Metal"
 msgstr "Metallskrot"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2342
 msgid "Bench"
 msgstr "Bänk"
@@ -16474,20 +16806,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 "Jakttorn"
 
 #. item
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2347
 msgid "Edit Hunting Stand"
 msgstr "Redigera ett jakttorn"
 
 #. item "Amenities/Hunting Stand" check "Shelter"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2350
 msgid "Hide"
 msgstr "Dölj"
 
 #. item "Amenities/Hunting Stand" check "Hide"
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2351
 msgid "Lock"
 msgstr "Lås"
@@ -16495,22 +16827,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 "Höjd"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2351
+#: build/trans_presets.java:2352
 msgid "low"
 msgstr "låg"
 
-#: build/trans_presets.java:2351
+#: build/trans_presets.java:2352
 msgid "half"
 msgstr "halv"
 
-#: build/trans_presets.java:2351
+#: build/trans_presets.java:2352
 msgid "full"
 msgstr "full"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2354
 msgid "Fountain"
 msgstr "Fontän"
@@ -16519,10 +16851,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 "Redigera en fontän"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2361
 msgid "Drinking Water"
 msgstr "Dricksvatten"
@@ -16531,10 +16863,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 "Redigera dricksvattensfacilitet"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2367
+#: build/trans_presets.java:2368
 msgid "Baby Hatch"
 msgstr ""
@@ -16542,25 +16874,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 "Affärer"
 
 #. group "Shops"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2377
 msgid "Supermarket"
 msgstr "Stormarknad"
 
 #. item
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2378
 msgid "Edit Supermarket"
 msgstr "Redigera stormarknad"
 
 #. item "Shops/Supermarket" text "Name"
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:2382
 msgid "Convenience Store"
 msgstr "Närköp"
@@ -16568,10 +16900,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 "Redigera närköp"
 
 #. item "Shops/Convenience Store" text "Name"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2388
 msgid "Kiosk"
 msgstr "Kiosk"
@@ -16579,10 +16911,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 "Redigera kiosk"
 
 #. item "Shops/Kiosk" text "Name"
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2394
 msgid "Vending machine"
 msgstr "Automat"
@@ -16590,5 +16922,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 "Redigera en automat"
@@ -16596,88 +16928,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 "Varor till försäljning"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "public_transport_tickets"
 msgstr "biljetter för allmänna transportmedel"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "public_transport_plans"
 msgstr ""
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "parking_tickets"
 msgstr "parkeringsbiljetter"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "food"
 msgstr "mat"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "drinks"
 msgstr "dryck"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "sweets"
 msgstr "godis"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "cigarettes"
 msgstr "cigaretter"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "photos"
 msgstr "foton"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "animal_food"
 msgstr "djurmat"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "news_papers"
 msgstr "tidningar"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "toys"
 msgstr "leksaker"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "stamps"
 msgstr "frimärken"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "SIM-cards"
 msgstr "SIM-kort"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "telephone_vouchers"
 msgstr "telefonkort"
 
-#: 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 "kondomer"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "tampons"
 msgstr "tamponger"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "excrement_bags"
 msgstr "hundpåsar"
 
 #. 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 "Slakteri"
@@ -16685,10 +17017,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 "Redigera slakteri"
 
 #. item "Shops/Butcher" text "Name"
-#: build/trans_presets.java:2414
+#: build/trans_presets.java:2415
 msgid "Baker"
 msgstr "Bageri"
@@ -16696,10 +17028,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 "Redigera bageri"
 
 #. item "Shops/Baker" text "Name"
-#: build/trans_presets.java:2420
+#: build/trans_presets.java:2421
 msgid "Florist"
 msgstr "Florist"
@@ -16707,20 +17039,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 "Redigera florist"
 
 #. 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 ""
@@ -16728,60 +17060,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 "Drycker"
 
 #. 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 "Dator"
 
 #. item
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2444
 msgid "Edit Computer Shop"
 msgstr "Redigera datoraffär"
 
 #. item "Shops/Computer" text "Name"
-#: build/trans_presets.java:2447
+#: build/trans_presets.java:2448
 msgid "Electronics"
 msgstr "Electronik"
 
 #. item
-#: build/trans_presets.java:2448
+#: build/trans_presets.java:2449
 msgid "Edit Electronics Shop"
 msgstr "Redigera elektronikaffär"
 
 #. item "Shops/Electronics" text "Name"
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2453
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2454
 msgid "Edit Hifi Shop"
 msgstr "Redigera hifi-affär"
 
 #. item "Shops/Hifi" text "Name"
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2458
 msgid "Furniture"
 msgstr "Möbler"
 
 #. item
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2459
 msgid "Edit Furniture Shop"
 msgstr "Redigera möbelaffär"
 
 #. item "Shops/Furniture" text "Name"
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2463
 msgid "Garden Centre"
 msgstr "Trädgårdscenter"
@@ -16789,10 +17121,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 "Redigera trädgårdscenter"
 
 #. item "Shops/Garden Centre" text "Name"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2469
 msgid "Hardware"
 msgstr "Järnvaror"
@@ -16800,10 +17132,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 "Redigera järnaffär"
 
 #. item "Shops/Hardware" text "Name"
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2475
 msgid "Do-it-yourself-store"
 msgstr "Gör-det-själv-affär"
@@ -16811,60 +17143,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 "Redigera gör-det-själv-affär"
 
 #. item "Shops/Do-it-yourself-store" text "Name"
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2481
 msgid "Stationery"
 msgstr "Kontorsmaterial"
 
 #. item
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2482
 msgid "Edit Stationery Shop"
 msgstr "Redigera pappershandel"
 
 #. item "Shops/Stationery" text "Name"
-#: build/trans_presets.java:2485
+#: build/trans_presets.java:2486
 msgid "Hairdresser"
 msgstr "Hårfrisör"
 
 #. item
-#: build/trans_presets.java:2486
+#: build/trans_presets.java:2487
 msgid "Edit Hairdresser"
 msgstr "Redigera hårfrisör"
 
 #. item "Shops/Hairdresser" text "Name"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2491
 msgid "Shoes"
 msgstr "Skor"
 
 #. item
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2492
 msgid "Edit Shoe Shop"
 msgstr "Redigera skoaffär"
 
 #. item "Shops/Shoes" text "Name"
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2496
 msgid "Toys"
 msgstr "Leksaker"
 
 #. item
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2497
 msgid "Edit Toy Shop"
 msgstr "Redigera leksaksaffär"
 
 #. item "Shops/Toys" text "Name"
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2501
 msgid "Video"
 msgstr "Videobutik"
 
 #. item
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2502
 msgid "Edit Video Shop"
 msgstr "Redigera videobutik"
 
 #. item "Shops/Video" text "Name"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2506
 msgid "Dry Cleaning"
 msgstr "Kemtvätt"
@@ -16872,10 +17204,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 "Redigera kemtvätt"
 
 #. item "Shops/Dry Cleaning" text "Name"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2512
 msgid "Laundry"
 msgstr "Tvätteri"
@@ -16883,10 +17215,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 "Redigera tvätteri"
 
 #. item "Shops/Laundry" text "Name"
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2518
 msgid "Outdoor"
 msgstr "Friluftsliv"
@@ -16894,35 +17226,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 "Redigera affär för friluftsliv"
 
 #. item "Shops/Outdoor" text "Name"
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2524
 msgid "Sports"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2525
 msgid "Edit Sports Shop"
 msgstr "Redigera sportaffär"
 
 #. item "Shops/Sports" text "Name"
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2529
 msgid "Optician"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2530
 msgid "Edit Optician"
 msgstr "Redigera optiker"
 
 #. item "Shops/Optician" text "Name"
-#: build/trans_presets.java:2535
+#: build/trans_presets.java:2536
 msgid "Cash"
 msgstr "Pengar"
 
 #. group "Cash"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2537
 msgid "Bank"
 msgstr "Bank"
@@ -16930,5 +17262,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 "Redigera bank"
@@ -16936,10 +17268,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 "Uttagsautomat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2544
 msgid "Money Exchange"
 msgstr "Växlingskontor"
@@ -16947,5 +17279,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 "Redigera växlingskontor"
@@ -16953,15 +17285,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 "Redigera uttagsautomat"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2557
 msgid "Health"
 msgstr "Hälsovård"
 
 #. group "Health"
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2558
 msgid "Doctors"
 msgstr "Läkare"
@@ -16969,20 +17301,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 "Redigera läkare"
 
 #. item "Health/Doctors" text "Name"
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2564
 msgid "Dentist"
 msgstr "Tandläkare"
 
 #. item
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2565
 msgid "Edit Dentist"
 msgstr "Redigera tandläkare"
 
 #. item "Health/Dentist" text "Name"
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2569
 msgid "Pharmacy"
 msgstr "Apotek"
@@ -16990,5 +17322,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 "Redigera apotek"
@@ -16996,10 +17328,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 "Receptutlämnande"
 
 #. item "Health/Pharmacy" text "Name"
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2576
 msgid "Hospital"
 msgstr "Sjukhus"
@@ -17007,10 +17339,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 "Redigera sjukhus"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2582
 msgid "Emergency Access Point"
 msgstr ""
@@ -17019,5 +17351,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 ""
@@ -17026,20 +17358,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2588
 msgid "Point Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2589
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2591
 msgid "Phone Number"
 msgstr "Telefonnummer"
 
 #. 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 "Använd internationellt format, ex +12-345-67890"
@@ -17047,5 +17379,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 "Veterinär"
@@ -17054,25 +17386,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 "Redigera veterinär"
 
 #. 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 "Redigera en kontinent"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2611
 msgid "Country"
 msgstr "Land"
 
 #. item
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2612
 msgid "Edit Country"
 msgstr "Redigera land"
@@ -17080,30 +17412,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 "Delstat"
 
 #. item
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2618
 msgid "Edit State"
 msgstr "Redigera delstat"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2622
+#: build/trans_presets.java:2623
 msgid "Region"
 msgstr "Region"
 
 #. item
-#: build/trans_presets.java:2623
+#: build/trans_presets.java:2624
 msgid "Edit Region"
 msgstr "Redigera region"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2628
+#: build/trans_presets.java:2629
 msgid "County"
 msgstr "Län"
 
 #. item
-#: build/trans_presets.java:2629
+#: build/trans_presets.java:2630
 msgid "Edit County"
 msgstr "Redigera län"
@@ -17111,15 +17443,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2635
+#: build/trans_presets.java:2636
 msgid "City"
 msgstr "Stad"
 
 #. item
-#: build/trans_presets.java:2636
+#: build/trans_presets.java:2637
 msgid "Edit City"
 msgstr "Redigera stad"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2641
+#: build/trans_presets.java:2642
 msgid "Town"
 msgstr "Småstad"
@@ -17127,10 +17459,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 "Redigera småstad"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2649
 msgid "Suburb"
 msgstr "Förort"
@@ -17138,25 +17470,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 "Redigera förort"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2656
 msgid "Village"
 msgstr "Mindre tätort"
 
 #. item
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2657
 msgid "Edit Village"
 msgstr "Redigera mindre tätort"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2662
 msgid "Hamlet"
 msgstr "Småort"
 
 #. item
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2663
 msgid "Edit Hamlet"
 msgstr "Redigera småort"
@@ -17164,5 +17496,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2669
 msgid "Locality"
 msgstr "Plats"
@@ -17170,10 +17502,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 "Redigera plats"
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2676
 msgid "Island"
 msgstr "Ö"
@@ -17181,5 +17513,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 "Redigera ö"
@@ -17187,5 +17519,5 @@
 #. item "Places/Island" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2683
+#: build/trans_presets.java:2684
 msgid "Cave Entrance"
 msgstr "Grottöppning"
@@ -17193,10 +17525,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 "Redigera en grottöppning"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2690
 msgid "Peak"
 msgstr "Topp"
@@ -17204,10 +17536,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 "Redigera topp"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2697
 msgid "Glacier"
 msgstr "Glaciär"
@@ -17215,10 +17547,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 "Redigera en glaciär"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2703
+#: build/trans_presets.java:2704
 msgid "Volcano"
 msgstr "Vulkan"
@@ -17226,70 +17558,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 "Redigera en vulkan"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2711
+#: build/trans_presets.java:2712
 msgid "Boundaries"
 msgstr "Gränser"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2713
 msgid "National"
 msgstr "Nationella"
 
 #. item
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2714
 msgid "Edit National Boundary"
 msgstr "Redigera nationsgränser"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2718
+#: build/trans_presets.java:2719
 msgid "Administrative"
 msgstr "Administrativ"
 
 #. item
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2720
 msgid "Edit Administrative Boundary"
 msgstr "Redigera administrativa gränser"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2724
+#: build/trans_presets.java:2725
 msgid "Civil"
 msgstr "Civilrättslig"
 
 #. item
-#: build/trans_presets.java:2725
+#: build/trans_presets.java:2726
 msgid "Edit Civil Boundary"
 msgstr "Redigera en civilrättslig gräns"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2730
+#: build/trans_presets.java:2731
 msgid "Political"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:2732
 msgid "Edit Political Boundary"
 msgstr "Redigera politiska gränser"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2736
+#: build/trans_presets.java:2737
 msgid "National park"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2737
+#: build/trans_presets.java:2738
 msgid "Edit National Park Boundary"
 msgstr "Redigera gräns för nationalpark"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2744
 msgid "Land use"
 msgstr "Markanvändning"
 
 #. group "Land use"
-#: build/trans_presets.java:2744
+#: build/trans_presets.java:2745
 msgid "Tree"
 msgstr "Träd"
@@ -17298,15 +17630,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 "Redigera ett träd"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2753
 msgid "Botanical Name"
 msgstr "Botaniskt namn"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2755
 msgid "Wood"
 msgstr "Naturskog"
@@ -17315,5 +17647,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 "Redigera naturskog"
@@ -17321,17 +17653,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 "barrskog"
 
-#: build/trans_presets.java:2760 build/trans_presets.java:2769
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
 msgid "deciduous"
 msgstr "lövskog"
 
-#: build/trans_presets.java:2760 build/trans_presets.java:2769
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
 msgid "mixed"
 msgstr "blandskog"
 
-#: build/trans_presets.java:2762
+#: build/trans_presets.java:2763
 msgid "Forest"
 msgstr "Kulturskog"
@@ -17340,14 +17672,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 "Redigera användning av mark för skogsbruk"
 
-#: build/trans_presets.java:2771
+#: build/trans_presets.java:2772
 msgid "Nature Reserve"
 msgstr "Naturreservat"
 
 #. item
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2773
 msgid "Edit Nature Reserve"
 msgstr "Redigera naturreservat"
@@ -17355,25 +17687,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2777
+#: build/trans_presets.java:2778
 msgid "Scree"
 msgstr "Bergsluttning (med lösa stenar)"
 
 #. item
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:2779
 msgid "Edit Scree"
 msgstr "Redigera bergssluttning (med lösa stenar)"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2783
 msgid "Scrub"
 msgstr "Buskage"
 
 #. item
-#: build/trans_presets.java:2783
+#: build/trans_presets.java:2784
 msgid "Edit Scrub"
 msgstr "Redigera buskage"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2788
 msgid "Fell"
 msgstr "Höglandshed"
@@ -17381,10 +17713,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 "Redigera en höglandshed"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2794
 msgid "Heath"
 msgstr "Hed"
@@ -17392,5 +17724,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 "Redigera hed"
@@ -17398,5 +17730,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2801
 msgid "Farmyard"
 msgstr "Gårdsplan"
@@ -17405,45 +17737,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 "Redigera markanvändning som gårdsplan"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2808
+#: build/trans_presets.java:2809
 msgid "Farmland"
 msgstr "Jordbruksmark"
 
 #. item
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2810
 msgid "Edit Farmland Landuse"
 msgstr "Redigera användning av mark för jordbruk"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2814
+#: build/trans_presets.java:2815
 msgid "Meadow"
 msgstr "Äng"
 
 #. item
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2816
 msgid "Edit Meadow Landuse"
 msgstr "Redigera markanvändning som äng"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2820
+#: build/trans_presets.java:2821
 msgid "Vineyard"
 msgstr "Vingård"
 
 #. item
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2822
 msgid "Edit Vineyard Landuse"
 msgstr "Redigera användning av mark för vingård"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2826
+#: build/trans_presets.java:2827
 msgid "Allotments"
 msgstr "Kolonilotter"
 
 #. item
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:2828
 msgid "Edit Allotments Landuse"
 msgstr "Redigera användning av mark för koloniområden"
@@ -17451,25 +17783,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2833
+#: build/trans_presets.java:2834
 msgid "Garden"
 msgstr "Trädgård"
 
 #. item
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2835
 msgid "Edit Garden"
 msgstr "Redigera trädgård"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2838
+#: build/trans_presets.java:2839
 msgid "Grass"
 msgstr "Gräs"
 
 #. item
-#: build/trans_presets.java:2839
+#: build/trans_presets.java:2840
 msgid "Edit Grass Landuse"
 msgstr "Redigera markanvändning som gräsyta"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2845
 msgid "Village Green"
 msgstr "Allmänning"
@@ -17477,10 +17809,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 "Redigera användning av mark för allmänning"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:2852
 msgid "Common"
 msgstr "Allmänning"
@@ -17488,20 +17820,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 "Redigera allmänning"
 
 #. 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 "Redigera park"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2863
 msgid "Recreation Ground"
 msgstr "Fritidsområde"
@@ -17509,5 +17841,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 "Redigera användning av mark för fritidsområde"
@@ -17515,15 +17847,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2871
 msgid "Residential area"
 msgstr "Bostadsområde"
 
 #. item
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2872
 msgid "Edit Residential Landuse"
 msgstr "Redigera användning av mark för bostadsområde"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2877
 msgid "Graveyard"
 msgstr "Kyrkogård"
@@ -17531,9 +17863,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 "Redigera kyrkogård"
 
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:2885
 msgid "Cemetery"
 msgstr "Begravningsplats"
@@ -17541,39 +17873,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 "Redigera användning av mark för begravningsplats"
 
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2894
 msgid "Retail"
 msgstr "Detaljhandel"
 
 #. item
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2895
 msgid "Edit Retail Landuse"
 msgstr "Redigera användning av mark för detaljhandel"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2900
 msgid "Commercial"
 msgstr "Affärsområde"
 
 #. item
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2901
 msgid "Edit Commercial Landuse"
 msgstr "Redigera användning av mark för affärsområde"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2906
 msgid "Industrial"
 msgstr "Industriområde"
 
 #. item
-#: build/trans_presets.java:2906
+#: build/trans_presets.java:2907
 msgid "Edit Industrial Landuse"
 msgstr "Redigera användning av mark för industriområde"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2912
 msgid "Railway land"
 msgstr "Järnvägsmark"
@@ -17581,15 +17913,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 "Redigera användning av mark för järnvägsmark"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:2919
 msgid "Military"
 msgstr "Militärt område"
 
 #. item
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2920
 msgid "Edit Military Landuse"
 msgstr "Redigera användning av mark för militärt område"
@@ -17597,55 +17929,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2925
+#: build/trans_presets.java:2926
 msgid "Construction area"
 msgstr "Byggnadsplats"
 
 #. item
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2927
 msgid "Edit Construction Landuse"
 msgstr "Redigera markanvändning som byggnadsplats"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2932
 msgid "Brownfield"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:2933
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2937
+#: build/trans_presets.java:2938
 msgid "Greenfield"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:2939
 msgid "Edit Greenfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:2944
 msgid "Landfill"
 msgstr "Deponi"
 
 #. item
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:2945
 msgid "Edit Landfill Landuse"
 msgstr "Redigera användning av mark för deponi av avfall"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2950
 msgid "Quarry"
 msgstr "Stenbrott"
 
 #. item
-#: build/trans_presets.java:2950
+#: build/trans_presets.java:2951
 msgid "Edit Quarry Landuse"
 msgstr "Redigera användning av mark för stenbrott"
 
 #. group "Relations"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2960
 msgid "Multipolygon"
 msgstr "Multipolygon"
@@ -17655,5 +17987,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 "Redigera en multipolygon"
@@ -17662,10 +17994,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:2970
 msgid "outer segment"
 msgstr "yttre segement"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:2970
+#: build/trans_presets.java:2971
 msgid "inner segment"
 msgstr "inre segment"
@@ -17673,5 +18005,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:2974
 msgid "Turn restriction"
 msgstr ""
@@ -17680,5 +18012,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 ""
@@ -17686,34 +18018,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 "Begränsning"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_left_turn"
 msgstr "ingen_vänstersväng"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_right_turn"
 msgstr "ingen_högersväng"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_straight_on"
 msgstr "inte_rakt_fram"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_u_turn"
 msgstr "ingen_u_sväng"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "only_right_turn"
 msgstr "enbart_högersväng"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "only_left_turn"
 msgstr "enbart_vänstersväng"
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "only_straight_on"
 msgstr "enbart_rakt_fram"
@@ -17722,15 +18054,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2983
+#: build/trans_presets.java:2984
 msgid "from way"
 msgstr "från sträcka"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2985
 msgid "via node or way"
 msgstr "via nod eller sträcka"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2986
 msgid "to way"
 msgstr "till sträcka"
@@ -17738,5 +18070,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:2988
+#: build/trans_presets.java:2989
 msgid "Route"
 msgstr ""
@@ -17745,5 +18077,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 ""
@@ -17751,5 +18083,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 ""
@@ -17821,5 +18153,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
@@ -17828,17 +18160,17 @@
 msgstr "cykel"
 
-#: 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 ""
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "ski"
 msgstr ""
@@ -17891,5 +18223,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
@@ -17898,13 +18230,13 @@
 msgstr "fot"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "hiking"
 msgstr ""
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "detour"
 msgstr ""
@@ -17918,10 +18250,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 "tunnelbana"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:2997
 msgid "Symbol description"
 msgstr ""
@@ -17929,26 +18261,26 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:2999
+#: build/trans_presets.java:3000
 msgid "Network"
 msgstr ""
 
 #. item "Relations/Route" combo "State"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3003
 msgid "Color (hex)"
 msgstr ""
@@ -17957,30 +18289,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:3006
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3007
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3008
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3009
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3010
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3011
 msgid "backward halt point"
 msgstr ""
@@ -22095,7 +22427,21 @@
 msgstr ""
 
+#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
+#~ msgstr ""
+#~ "Du kan använda musen eller Ctrl+Piltangenter/./ för att zooma och "
+#~ "panorera."
+
 #~ msgid "Uploading data"
 #~ msgstr "Skickar data"
 
+#~ msgid "Email"
+#~ msgstr "Email"
+
+#~ msgid "Login name (email) to the OSM account."
+#~ msgstr "Användarnamn (epost) för OSM-kontot"
+
+#~ msgid "OSM username (email)"
+#~ msgstr "OSM-användarnamn (email)"
+
 #~ msgid "Unknown host"
 #~ msgstr "Okänd värddator"
@@ -22103,4 +22449,11 @@
 #~ msgid "Add either site-josm.xml or Wiki Pages."
 #~ msgstr "Lägg till antingen site-josm.xml eller wikisidor."
+
+#~ msgid ""
+#~ "Server returned internal error. Try a reduced area or retry after waiting "
+#~ "some time."
+#~ msgstr ""
+#~ "Servern svarade med internt fel. Försök med ett mindre område eller "
+#~ "försök igen efter en stund."
 
 #~ msgid "Commit comment"
@@ -22159,6 +22512,65 @@
 #~ "Vill du verkligen sätta status för detta problemfall som \"slutförd\"?"
 
+#~ 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 URL.<br><b>Do not use a valuable Password.</b></html>"
+#~ msgstr ""
+#~ "<html>VARNING: Lösenordet lagras okryperat i inställningsfilen."
+#~ "<br>Lösenordet skickas okryperat till servern, som en del av URL:en."
+#~ "<br><b>Använd inte ett värdefullt lösenord.</b></html>"
+
 #~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS"
 #~ msgstr "Hämta en korrigerad bild från Metacartas kartkorrigerar-WMS"
+
+#~ msgid ""
+#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab "
+#~ "- these will then show up in the WMS menu.\n"
+#~ "\n"
+#~ "You can also do this manually in the Advanced Preferences, using the "
+#~ "following schema:\n"
+#~ "wmsplugin.url.1.name=Landsat\n"
+#~ "wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n"
+#~ "wmsplugin.url.2.name=NPE Maps... etc\n"
+#~ "\n"
+#~ "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"
+#~ "\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"
+#~ "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"
+#~ "Note: Make sure the image is suitable, copyright-wise, if in doubt, don't "
+#~ "use."
+#~ msgstr ""
+#~ "Du kan lägga till, ändra och ta bort WMS-poster med hjälp av "
+#~ "inställningsfliken för WMSplugin - dessa kommer att synas i WMS-menyn.\n"
+#~ "\n"
+#~ "Du kan också göra dessa ändringar manuellt under avancerade "
+#~ "inställningar, enligt följande mall:\n"
+#~ "wmsplugin.url.1.name=Landsat\n"
+#~ "wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n"
+#~ "wmsplugin.url.2.name=NPE Maps... etc\n"
+#~ "\n"
+#~ "Exempel på fullständigt WMS URL-inmatningsformat (landsat)\n"
+#~ "http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n"
+#~ "layers=global_mosaic&styles=&srs=EPSG:4326&\n"
+#~ "format=image/jpeg \n"
+#~ "\n"
+#~ "Vad gäller Metacartas Kartkorrigerare http://labs.metacarta.com/"
+#~ "rectifier/ , så behöver du enbart ange relevant 'id'.\n"
+#~ "För att lägga till en menypost för en korrigerad karta från Metacarta, "
+#~ "skapa manuellt en url som i följande exempel och ersätt 73 med id för din "
+#~ "bild: \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"
+#~ "Observera: Se till att bilden får användas enligt copyright-regler, om du "
+#~ "är tveksam så använd inte den."
 
 #~ msgid "Portcullis"
@@ -22185,10 +22597,30 @@
 #~ msgstr "viadukt"
 
+#~ msgid "Open the OpenStreetBugs window and activate the automatic download"
+#~ msgstr "Öppna OpenStreetBugs-listan och aktiverar automatisk hämtning"
+
 #~ msgid "sports"
 #~ msgstr "Sportaffär"
 
+#~ msgid ""
+#~ "Lambert zone {0} in cache  incompatible with current Lambert zone {1}"
+#~ msgstr "Lambertzon {0} i cache inkompatibel med nuvarande Lambertzon {1}"
+
 #~ msgid "Delete and Download"
 #~ msgstr "Ta bort och hämta hem"
 
+#~ msgid "No intersections found. Nothing was changed."
+#~ msgstr "Inga tvärsnitt hittades. Ingenting har ändrats."
+
+#~ msgid ""
+#~ "This action will require {0} individual download requests. Do you wish to "
+#~ "continue?"
+#~ msgstr ""
+#~ "Denna handling kräver {0} enskilda hämtningsförfrågningar. Vill du "
+#~ "fortsätta?"
+
+#~ msgid "The following errors occured during mass download:"
+#~ msgstr "Följande fel uppstod vid massnedladdning:"
+
 #~ msgid "Edit Drawbridge"
 #~ msgstr "Redigera en klaffbro"
@@ -22197,4 +22629,14 @@
 #~ msgstr "Redigera ett fällgaller"
 
+#~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">english</A>."
+#~ msgstr "Hjälpsida saknas. Skapa den på <A HREF=\"{0}\">engelska</A>."
+
+#~ msgid ""
+#~ "Helppage missing. Create it in <A HREF=\"{0}\">english</A> or <A HREF="
+#~ "\"{1}\">your language</A>."
+#~ msgstr ""
+#~ "Hjälpsida saknas. Skapa den på <A HREF=\"{0}\">engelska</A> eller <A HREF="
+#~ "\"{1}\">ditt språk</A>."
+
 #~ msgid "Remove route nodes"
 #~ msgstr "Ta bort ruttnoder"
Index: applications/editors/josm/i18n/po/tr.po
===================================================================
--- applications/editors/josm/i18n/po/tr.po	(revision 16008)
+++ applications/editors/josm/i18n/po/tr.po	(revision 16009)
@@ -10,6 +10,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-14 16:51+0200\n"
-"PO-Revision-Date: 2009-06-09 18:22+0000\n"
+"POT-Creation-Date: 2009-06-19 21:52+0200\n"
+"PO-Revision-Date: 2009-06-14 17:45+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Türkçe\n"
@@ -18,5 +18,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2009-06-14 14:46+0000\n"
+"X-Launchpad-Export-Date: 2009-06-19 19:35+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -29,11 +29,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 "Yardım"
 
 #: ../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 ""
 
@@ -72,6 +72,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
@@ -88,8 +90,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
@@ -138,5 +140,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"
@@ -535,5 +537,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}"
@@ -605,6 +607,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:92
-msgid "Email"
-msgstr "E-Mail"
+msgid "E-Mail"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:96
@@ -642,12 +644,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
@@ -674,5 +678,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
@@ -705,5 +709,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:207
 #, java-format
-msgid "Helppage missing. Create it in <A HREF=\"{0}\">english</A>."
+msgid "Help page missing. Create it in <A HREF=\"{0}\">english</A>."
 msgstr ""
 
@@ -711,5 +715,5 @@
 #, 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 ""
@@ -1135,13 +1139,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:99
 msgid "Status Report"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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
@@ -1333,102 +1337,272 @@
 msgstr "Seçimleri Kaldır (Kaçış)"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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?"
 msgstr ""
 
-#: ../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 ""
-
-#: ../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 "OSM ye yükle..."
 
-#: ../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 "Bütün değişiklikleri OSM server'ına yükle."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:96
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:94
 msgid "Objects to add:"
 msgstr "Eklenilecek objeler:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102
 msgid "Objects to modify:"
 msgstr "Düzenlenecek objeler:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:110
 msgid "Objects to delete:"
 msgstr "Silinecek objeler:"
 
-#: ../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 "Yaptığınız yükleme için kısa bir bilgi yazınız:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:126
 msgid "Upload these changes?"
 msgstr "Değişiklikleri yükle?"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:130
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
 msgid "Upload Changes"
 msgstr ""
 
-#: ../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 "Yüklenilecek bişey yok. Lütfen ilk seçim yapınız."
 
-#: ../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 "Çözülmemiş çelişkiler var. İlk olarak çözümleyiniz."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:182
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:180
 msgid "No changes to upload."
 msgstr "Yüklenilecek değişiklik yok."
 
-#: ../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 ""
@@ -1533,36 +1707,50 @@
 msgstr "Ham GPS verisi"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:44
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:46
 msgid "Downloading data"
 msgstr "Bilgi İndiriliyor"
 
-#: ../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 "İçeri bilgi alınamadı."
 
-#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:83
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:88
 msgid "OpenStreetMap data"
 msgstr "OpenStreetMap verisi"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:37
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:45
 msgid "Data Layer"
 msgstr "Bilgi Tabakası"
 
-#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:88
-msgid "The following errors occured during mass download:"
-msgstr ""
-
-#: ../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 ""
+
+#: ../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 ""
 
@@ -1616,34 +1804,34 @@
 msgstr "Dünya dışına bir kavşak ekleyemezsiniz."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:495
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:493
 msgid "Add node"
 msgstr "Kavşak Ekle"
 
-#: ../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 "Yola kavşak ekle"
 
-#: ../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 "Varolan yolu kavşağa ekle"
 
-#: ../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 "Varolan yola kavaşka ekle"
 
-#: ../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 "Yola kavşak ekle ve birleştir"
 
-#: ../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 ""
 
+#: ../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 ""
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:888
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:910
-msgid "Select node under cursor."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890
 #, java-format
 msgid "Insert new node into way."
@@ -1652,14 +1840,14 @@
 msgstr[1] ""
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:897
+msgid "Start new way from last node."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:899
-msgid "Start new way from last node."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:901
 msgid "Continue way from last node."
 msgstr ""
 
-#: ../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 ""
@@ -1978,26 +2166,32 @@
 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 "Seçili alanı yükle"
 
-#: ../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 "Kontak {0}..."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:45
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:46
 msgid "Downloading..."
 msgstr "İndiriliyor..."
 
-#: ../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 "Link okunamadı: \"{0}\""
 
-#: ../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 "Link ayrıştırılamadı: \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:74
+msgid "Error while communicating with server."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67
@@ -2057,13 +2251,84 @@
 msgstr "Çözümle {0} karşıklıkları {1} objelerinde"
 
-#: ../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 "Sil {1} {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97
+#, java-format
+msgid "Delete {0} {1}"
+msgstr "Sil {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153
+msgid "Conflicting relation"
+msgstr "İlişkilerde Karışıklık"
+
+#: ../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 ""
+"Seçim \"{0}\" ,\"{1}\" ilişkisi tarafından {2} rölü için kullanılıyor.\n"
+"İlişkiden sil?"
+
+#: ../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 ""
+"Seçim \"{0}\", ilişki \"{1}\" tarafından kullanılıyor.\n"
+"İlişkiden Sil?"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:366
+msgid "Split way segment"
+msgstr "Yol segmentini ayrıştır"
+
+#. 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 ""
+"İndirdiğiniz alan dışındaki bir kavşağı sileceksiniz.<br>Göremediğiniz başka "
+"objeler onu kullanıyor olabilir. <br>Gerçekten silmek istiyormusunuz?"
+
+#: ../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 "Taşı"
+
 #: ../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 +2336,219 @@
 msgstr[0] "kavşak"
 
-#: ../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 "İlişkiÜyesinikaldır"
+
+#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
+msgid "Rotate"
+msgstr "Dönder"
+
+#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88
+msgid "Sequence"
+msgstr "Sıra"
+
+#: ../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 "Uygula?"
+
+#: ../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 ""
+"Bu yolu terslerken şu yolun özelliği ve onun sahip olduğu kavşalarında "
+"değişmesidata bütünlüğü için önerilir."
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28
+msgid "Relation"
+msgstr "İlişki"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30
+msgid "Old role"
+msgstr "Eski Rol"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:32
+msgid "New role"
+msgstr "Yeni Rol"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
+msgid "Old key"
+msgstr "Eski Anahtar"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
+msgid "Old value"
+msgstr "Eski Değer"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
+msgid "New key"
+msgstr "Yeni Anahtar"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
+msgid "New value"
+msgstr "Yeni Değer"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:40
+msgid "Apply selected changes"
+msgstr "Seçili değişiklikleri uygula"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41
+msgid "Don't apply changes"
+msgstr "Değişiklikleri Uygulama"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:83
+msgid "Please select which property changes you want to apply."
+msgstr "lütfen hangi özelliğin değişimin uygulanacağını seçiniz."
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:96
+msgid "Properties of "
+msgstr "Özellikleri "
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:120
+msgid "Roles in relations referring to"
+msgstr "İlişkide rolü şunu gösteriyor"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:136
+msgid "Automatic tag correction"
+msgstr "Otomatic etiket düzetmesi"
+
+#: ../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 "Tercihler klasörü açılamıyor: {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 "Tercihler dosyasında hata. Eskisi yedek olarak kullanılıyor {0}."
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:79
+#, java-format
+msgid "Preferences stored on {0}"
+msgstr "Tercihler {0} üzerinde saklanıldı"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:82
+#, java-format
+msgid "Could not upload preferences. Reason: {0}"
+msgstr "Could not upload preferences. Reason: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:93
+msgid "Could not load preferences from server."
+msgstr "Tercihler serverdan alınamadı."
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:34
+msgid "different"
+msgstr "farklı"
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:262
+msgid "deleted"
+msgstr "silindi"
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
+msgid "true"
+msgstr "doğru"
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
+msgid "false"
+msgstr "yanlış"
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20
+msgid "position"
+msgstr "pozisyon"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30
+msgid "Decimal Degrees"
+msgstr "Ondalık Derece"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
+msgid "Degrees Minutes Seconds"
+msgstr "Derece Dakika Saniye"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+msgid "S"
+msgstr "G"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+msgid "N"
+msgstr "K"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+msgid "W"
+msgstr "B"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+msgid "E"
+msgstr "D"
+
+#: ../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 "eksik"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
+#, java-format
+msgid "Error: {0}"
+msgstr "Hata: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
+#, java-format
+msgid "Warning: {0}"
+msgstr "Uyarı: {0}"
+
+#: ../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"
@@ -2082,8 +2556,10 @@
 msgstr[0] "yol"
 
-#: ../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
@@ -2093,264 +2569,27 @@
 msgstr[0] "ilişki"
 
-#: ../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 "Sil {1} {0}"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97
-#, java-format
-msgid "Delete {0} {1}"
-msgstr "Sil {0} {1}"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153
-msgid "Conflicting relation"
-msgstr "İlişkilerde Karışıklık"
-
-#: ../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 ""
-"Seçim \"{0}\" ,\"{1}\" ilişkisi tarafından {2} rölü için kullanılıyor.\n"
-"İlişkiden sil?"
-
-#: ../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 ""
-"Seçim \"{0}\", ilişki \"{1}\" tarafından kullanılıyor.\n"
-"İlişkiden Sil?"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:366
-msgid "Split way segment"
-msgstr "Yol segmentini ayrıştır"
-
-#. 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 ""
-"İndirdiğiniz alan dışındaki bir kavşağı sileceksiniz.<br>Göremediğiniz başka "
-"objeler onu kullanıyor olabilir. <br>Gerçekten silmek istiyormusunuz?"
-
-#: ../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 "Taşı"
-
-#: ../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 "İlişkiÜyesinikaldır"
-
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
-msgid "Rotate"
-msgstr "Dönder"
-
-#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88
-msgid "Sequence"
-msgstr "Sıra"
-
-#: ../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 "Uygula?"
-
-#: ../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 ""
-"Bu yolu terslerken şu yolun özelliği ve onun sahip olduğu kavşalarında "
-"değişmesidata bütünlüğü için önerilir."
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28
-msgid "Relation"
-msgstr "İlişki"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30
-msgid "Old role"
-msgstr "Eski Rol"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:32
-msgid "New role"
-msgstr "Yeni Rol"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
-msgid "Old key"
-msgstr "Eski Anahtar"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
-msgid "Old value"
-msgstr "Eski Değer"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
-msgid "New key"
-msgstr "Yeni Anahtar"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
-msgid "New value"
-msgstr "Yeni Değer"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:40
-msgid "Apply selected changes"
-msgstr "Seçili değişiklikleri uygula"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41
-msgid "Don't apply changes"
-msgstr "Değişiklikleri Uygulama"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:83
-msgid "Please select which property changes you want to apply."
-msgstr "lütfen hangi özelliğin değişimin uygulanacağını seçiniz."
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:96
-msgid "Properties of "
-msgstr "Özellikleri "
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:120
-msgid "Roles in relations referring to"
-msgstr "İlişkide rolü şunu gösteriyor"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:136
-msgid "Automatic tag correction"
-msgstr "Otomatic etiket düzetmesi"
-
-#: ../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 "Tercihler klasörü açılamıyor: {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 "Tercihler dosyasında hata. Eskisi yedek olarak kullanılıyor {0}."
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:79
-#, java-format
-msgid "Preferences stored on {0}"
-msgstr "Tercihler {0} üzerinde saklanıldı"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:82
-#, java-format
-msgid "Could not upload preferences. Reason: {0}"
-msgstr "Could not upload preferences. Reason: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:93
-msgid "Could not load preferences from server."
-msgstr "Tercihler serverdan alınamadı."
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:34
-msgid "different"
-msgstr "farklı"
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:262
-msgid "deleted"
-msgstr "silindi"
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
-msgid "true"
-msgstr "doğru"
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
-msgid "false"
-msgstr "yanlış"
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20
-msgid "position"
-msgstr "pozisyon"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30
-msgid "Decimal Degrees"
-msgstr "Ondalık Derece"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
-msgid "Degrees Minutes Seconds"
-msgstr "Derece Dakika Saniye"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
-msgid "S"
-msgstr "G"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
-msgid "N"
-msgstr "K"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
-msgid "W"
-msgstr "B"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
-msgid "E"
-msgstr "D"
-
-#: ../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 "eksik"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
-#, java-format
-msgid "Error: {0}"
-msgstr "Hata: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
-#, java-format
-msgid "Warning: {0}"
-msgstr "Uyarı: {0}"
-
-#: ../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"
@@ -2363,5 +2602,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:122
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "railway"
 msgstr "demiryolu"
@@ -2381,4 +2620,62 @@
 msgid_plural "{0} nodes"
 msgstr[0] "{0} Kavşak"
+
+#: ../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
@@ -2527,5 +2824,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 "arkaplan"
@@ -2603,8 +2900,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
@@ -2616,7 +2913,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
@@ -2723,10 +3020,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 "KullanıcıAdı"
 
 #: ../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 "şifre"
@@ -2822,22 +3119,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:146
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148
 msgid "File"
 msgstr "Dosya"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150
 msgid "View"
 msgstr "Görünüm"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:149
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151
 msgid "Tools"
 msgstr "Araçlar"
 
-#: ../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 "Ayarlanmış"
 
-#: ../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
@@ -2850,21 +3147,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 "Tel Görünümü"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:218
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221
 msgid "Toggle Wireframe view"
 msgstr "Tel Göünümünü İşaretle"
 
-#: ../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 "Ses"
@@ -2936,6 +3233,6 @@
 msgstr "(obje yok)"
 
-#: ../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 "tabaka listede yok."
@@ -2945,9 +3242,9 @@
 msgstr "OSM serverına bağlanılıyor..."
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:104
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:105
 msgid "Error while parsing"
 msgstr "Ayrıştırma esnasında hata"
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:107
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:108
 msgid "File not found"
 msgstr "Dosya bulunamadı"
@@ -3019,5 +3316,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 "Üyeler"
@@ -3213,5 +3510,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
@@ -3293,5 +3590,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 ""
@@ -3330,5 +3627,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 ""
 
@@ -3382,5 +3679,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 "Rol"
@@ -3484,5 +3781,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
@@ -3789,5 +4086,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 "İlişkiler"
@@ -3890,66 +4187,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 ""
 
-#: ../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 "Meşgul Eden"
 
-#: ../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 "Etiket (Boş değerler etiketi siler)"
 
-#: ../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 "Seçili üyeyi yukarı taşı"
 
-#: ../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 "Seçileni Ekle"
 
-#: ../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 "Seçili bütün objeleri üye olarak ekle"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "Seçili üyeyi aşağı taşı"
 
-#: ../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 "Seçili satırdaki üyeyi bu ilişkiden kaldır"
 
-#: ../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 "Üyeleri İndir"
 
-#: ../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 "Bütün eksik yolları ve kavşakları ilişkili olarak indir"
@@ -3994,5 +4291,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
@@ -4013,9 +4310,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 "Evet"
 
-#: ../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
@@ -4037,31 +4334,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 "hayır"
 
-#: ../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 "Üyeler: {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 "İçeri taşıma esnasında karşıklık oluştu."
 
-#: ../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 "Serverın cevabı tanımlanamdı."
 
-#: ../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 "Server'a bağlantı kurulamadı."
+
+#: ../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
@@ -4125,17 +4425,17 @@
 msgstr "Bilgi Kaynağı ve Tipi"
 
-#: ../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 "Yeni tabaka olarak indir"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:174
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:173
 msgid "Download Area"
 msgstr "Alanı indir"
 
-#: ../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 "Seçilen alan çok büyük; server iptal edecektir"
 
-#: ../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 "Seçilen alan uygun, server kabul edecektir"
@@ -4163,5 +4463,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 "Yerler"
@@ -4208,21 +4508,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 "tip"
@@ -4262,14 +4562,4 @@
 msgid "Tile Numbers"
 msgstr "Pafta Numarası"
-
-#: ../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 "Fare veya Ctrl+ok tuşları ile /./  zoom ve pan yapabilirsin."
-
-#. 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 "Harita"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:98
@@ -4347,5 +4637,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 +4751,14 @@
 msgstr "Wave Audio files (*.wav)"
 
-#: ../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 "{0} daki ses imleçleri"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244
 msgid "Import images"
 msgstr "Görüntüleri içeri al"
 
-#: ../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, "
@@ -4476,5 +4766,5 @@
 msgstr[0] "{0} iz, "
 
-#: ../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, "
@@ -4482,5 +4772,5 @@
 msgstr[0] "{0} rut, "
 
-#: ../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"
@@ -4488,28 +4778,28 @@
 msgstr[0] "{0} yol noktaları"
 
-#: ../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 "İsim: {0}"
 
-#: ../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 "Tanım: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347
 msgid "Timespan: "
 msgstr "Zaman_aralığı: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354
 msgid "Length: "
 msgstr "Uzunluk: "
 
-#: ../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 "Bilgi tabakasına çevir"
 
-#: ../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 ""
@@ -4520,11 +4810,11 @@
 "yüklemek isterseniz buraya bakınız:"
 
-#: ../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
@@ -4534,29 +4824,29 @@
 msgstr "Çevrildiği yer: {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 "OSM den bu izi indir"
 
-#: ../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 "Bunun içindeki herşeyi indir:"
 
-#: ../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 "{0} metre"
 
-#: ../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 "Her istek için max. alan:"
 
-#: ../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 "{0} km2"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:822
 #, java-format
 msgid ""
@@ -4567,9 +4857,9 @@
 "istiyor musunuz?</html>"
 
-#: ../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 "Tabakada ses ile ilişkilendirilecek GPX izi yok."
 
-#: ../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 "
@@ -4577,5 +4867,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 +4874,42 @@
 "Bazı çok uzak yol noktaları, zaman hassiyetine uymadığı için çıkartıldı."
 
-#: ../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 "indirilen alanın dışında"
 
-#: ../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 "{0} şunları içerir:"
 
-#: ../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} silindi.)"
 
-#: ../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 +4917,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"
@@ -4769,5 +5068,5 @@
 msgstr "Varsayılan değer bilinmiyor (ayar henuz kullanılmadı)."
 
-#: ../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
@@ -4776,5 +5075,5 @@
 msgstr "Editlemek için bir satır seçiniz."
 
-#: ../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
@@ -4782,5 +5081,5 @@
 msgstr "{0} için yeni değer"
 
-#: ../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
@@ -4790,5 +5089,5 @@
 msgstr "Silmek için bir satır seçiniz."
 
-#: ../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 "Yeni bir anahtar/değer çifti gir"
@@ -5670,106 +5969,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 "İsim"
@@ -6235,6 +6534,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:36
-msgid "Login name (email) to the OSM account."
-msgstr "OSM için Login adı (email) ."
+msgid "Login name (e-mail) to the OSM account."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
@@ -6248,6 +6547,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
-msgid "OSM username (email)"
-msgstr "OSM kullanıcı_adı (e-mail)"
+msgid "OSM username (e-mail)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
@@ -6258,10 +6557,7 @@
 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 ""
-"<html>UYARI: şifre konfigürasyon dosyasında düz metin olarak tutulmaktadır."
-"<br>şifre internet üzerinde aynı şekilde düz metin olarak gönderilmektedir. "
-"<br><b>Değerli bir şifre kullanmayınız.</b></html>"
 
 #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on
@@ -6569,6 +6865,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 "OSM Server'ına Bağlanıyor..."
@@ -6579,7 +6876,7 @@
 msgstr "{0} ve {1} arası bilgiler indiriliyor"
 
-#: ../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 "OSM bilgisi indiriliyor..."
@@ -6644,15 +6941,14 @@
 msgstr "NMEA içeri alınmasında hata!"
 
-#: ../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 ""
@@ -6661,31 +6957,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 "Açılıyor..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:351
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298
 msgid "Closing changeset..."
 msgstr "Kapanıyor..."
 
-#: ../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 "Hazırlanıyor..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:381
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:326
 msgid "Uploading..."
 msgstr "Yükleniyor..."
@@ -6700,25 +7002,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 "Hatalı kullanıcı adı veya şifre."
 
-#: ../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 "Uyarı: Şifre düz metin olarak ileticektir."
 
-#: ../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 "KullanıcıAdı ve şifreyi Sakla (Düz Metin Olarak)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:89
 msgid "Enter Password"
 msgstr "Enter Password"
 
-#: ../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..."
@@ -6729,4 +7031,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."
@@ -6819,9 +7164,23 @@
 msgstr "Yanlış tanımlı kavşak bilgisi"
 
-#: ../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 "Server'e bağlanıyor..."
 
-#: ../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."
@@ -6830,16 +7189,9 @@
 "ediniz."
 
-#: ../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 bir hata bildirdi. Küçük bir alan deneyiniz veya daha sonra yapınız."
-
-#: ../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 ""
 
@@ -6855,5 +7207,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 ""
@@ -7037,9 +7389,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 "Eksik eklentileri yükle"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:128
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:119
 #, java-format
 msgid ""
@@ -7052,6 +7404,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
@@ -7074,35 +7426,35 @@
 msgstr "bilinmeyen"
 
-#: ../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}: Versiyon {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 "Eklenti JOSM ile beraber geliyor."
 
-#: ../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 "Eklentinin açıklaması okunamadı: {0}"
 
-#: ../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 "Bu kayıdın sonunda."
 
-#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:329
+#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:340
 msgid "Error playing sound"
 msgstr "Sesin çalıştırılmasında hata"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
 msgid "Do nothing"
 msgstr "Birşey Yapma"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
 msgid "Report Bug"
 msgstr "hatayı Bildir"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:52
 msgid ""
 "An unexpected exception occurred.\n"
@@ -7116,18 +7468,18 @@
 "hatayı bildiriniz"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55
 msgid "Unexpected Exception"
 msgstr "Beklenmedik Durum"
 
-#: ../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 "Lütfen {0} 'daki problemi bildiriniz"
 
-#: ../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 "Hatayı oluşturan adımları belirtiniz (Mümkün olduğunca detaylı)!"
 
-#: ../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 "
@@ -7137,9 +7489,9 @@
 "deneyiniz."
 
-#: ../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 "Aşağıdaki bilgiyi eklediğinizden emin olunuz:"
 
-#: ../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 "(Metin zaten panoda mevcut.)"
@@ -7223,5 +7575,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 ""
@@ -7601,5 +7953,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 ""
@@ -7633,5 +7985,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"
@@ -7654,5 +8005,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
@@ -7743,6 +8094,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/"
@@ -7818,6 +8169,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
@@ -7825,11 +8176,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 ""
@@ -7846,13 +8197,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 ""
@@ -7873,5 +8224,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 ""
 
@@ -7963,5 +8314,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
@@ -7969,59 +8320,28 @@
 msgstr "Boş Tabaka"
 
+#: ../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 "WMS tabakasını dosyaya kaydet"
-
-#: ../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 "WMS tabakasını dosyadan yükle"
-
-#: ../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 "Desteklenmeyen WMS versiyonu; bulunan {0}, istenen {1}"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:325
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:335
-msgid "File Format Error"
-msgstr "Dosya Format Hatası"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:481
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:401
 #, java-format
 msgid ""
@@ -8030,14 +8350,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 ""
@@ -8132,11 +8452,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 "Yolu GPX tabakasından içeri al"
 
 #: ../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 "Var olan yolu iptal et"
@@ -8146,5 +8466,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 "GPX veri tabaksı bulunamadı."
@@ -8434,4 +8754,8 @@
 msgid "Lakewalker trace"
 msgstr "Gölyürüyüşü takip ediliyor"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:10
+msgid "An unknown error has occurred"
+msgstr ""
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
@@ -8751,42 +9075,42 @@
 msgstr "Canlı GPS"
 
-#: ../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 "ölçülen değerler"
 
-#: ../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 "ölçümler penceresini aç."
 
-#: ../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 "Reset"
 
-#: ../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 "Şimdiki ölçümü sıfırla ve ölçüm yolunu sil."
 
-#: ../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 "Yol uzunluğu"
 
-#: ../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 "Seçim Uzunluğu"
 
-#: ../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 "Seçim Alanı"
 
-#: ../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 "Açı"
 
-#: ../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 "Seçili iki kavşak arası açı"
 
-#: ../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 "Ölçüm tabakası"
@@ -8845,6 +9169,6 @@
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
-msgid "Open the OpenStreetBugs window and activate the automatic download"
-msgstr "OpenStreet Hatalarını Aç ve otomatik indirmeyi etkinleştir"
+msgid "Opens the OpenStreetBugs window and activates the automatic download"
+msgstr ""
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:123
@@ -8919,5 +9243,5 @@
 msgstr "Osmarender"
 
-#: ../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 "
@@ -8927,9 +9251,9 @@
 "ayarlarını yapınız"
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:123
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:127
 msgid "osmarender options"
 msgstr "osmarender seçenekleri"
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:124
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:128
 msgid "Firefox executable"
 msgstr "Firefox exe"
@@ -9358,5 +9682,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 "Sokak Adı"
@@ -9449,5 +9773,5 @@
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:195
-msgid "No intersections found. Nothing was changed."
+msgid "No intersection found. Nothing was changed."
 msgstr ""
 
@@ -10324,39 +10648,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 ""
-"WMS tercihler sekmesinden şu ayarları yapabilirsiniz. Veri ekle, sil, düzelt "
-"gibi - menuler ekranında görünecektir.\n"
-"\n"
-"Aynı zamanda aşağıdaki şemayı kullanarak, ileri tercihler kısmındada "
-"yapabilirsiniz:\n"
-" wmsplugin.url.1.name=Landsat\n"
-"wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n"
-"wmsplugin.url.2.name=NPE Maps... etc\n"
-"\n"
-"Tam WMS link formatı örnek (landsat)\n"
-"http://onearth.jpl.nasa.gov/wms.cgi?"
-"request=GetMap&layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg\n"
-"\n"
-"Metacarta Map Rectifier için http://labs.metacarta.com/rectifier/ ,  sadece "
-"gerekli 'id' ye ihtiyacınız var.\n"
-"Metacarta Map Rectifier menusunu eklemek için şu linki örnek olarak, 73 ü "
-"sizin 'id' niz ile değiştirin:\n"
-"http://labs.metacarta.com/rectifier/wms.cgi?"
-"id=73&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&\n"
-"format=image/png"
-
-#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:54
+
+#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:53
 msgid "WMS Plugin Help"
 msgstr "WMS Eklenti Yardımı"
@@ -10415,5 +10718,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113
 #, java-format
 msgid ""
@@ -10458,4 +10761,29 @@
 msgid "Alpha channel"
 msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
+msgid "Save WMS layer to file"
+msgstr "WMS tabakasını dosyaya kaydet"
+
+#: ../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 "WMS tabakasını dosyadan yükle"
+
+#: ../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 "Desteklenmeyen WMS versiyonu; bulunan {0}, istenen {1}"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:335
+msgid "File Format Error"
+msgstr "Dosya Format Hatası"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:163
@@ -10550,4 +10878,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 ""
@@ -10562,5 +10895,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 ""
 
@@ -10844,5 +11177,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 "Referans"
@@ -11344,5 +11677,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 ""
@@ -11811,7 +12144,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 "Tip"
@@ -12427,10 +12760,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 "Operator"
@@ -12642,7 +12975,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 "yükseklik"
@@ -13574,5 +13907,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 "Ücret"
@@ -13708,5 +14041,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 "referans (iz numarası)"
@@ -13714,5 +14047,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 "Alan"
@@ -13764,11 +14097,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 "Sığınak"
+
+#. item "Public Transport/Bus Stop" check "Shelter"
 #. </optional>
-#: build/trans_presets.java:1503
+#: build/trans_presets.java:1504
 msgid "Bus Platform"
 msgstr "otobüs platformu"
 
 #. item
-#: build/trans_presets.java:1504
+#: build/trans_presets.java:1505
 msgid "Edit Bus Platform"
 msgstr "otobüs platformu düzenle"
@@ -13776,5 +14119,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1512
+#: build/trans_presets.java:1513
 msgid "Taxi"
 msgstr "Taksi"
@@ -13782,5 +14125,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 "taksi istasyonu düzenle"
@@ -13788,5 +14131,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1519
+#: build/trans_presets.java:1520
 msgid "Airport"
 msgstr "Havaalanı"
@@ -13794,15 +14137,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 "IATA"
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1527
+#: build/trans_presets.java:1528
 msgid "ICAO"
 msgstr "ICAO"
@@ -13811,5 +14154,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1532
+#: build/trans_presets.java:1533
 msgid "Accomodation"
 msgstr "Kalınacak Yerler"
@@ -13821,5 +14164,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 "Hotel"
@@ -13828,15 +14171,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 "Hotel Düzenle"
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1539
+#: build/trans_presets.java:1540
 msgid "Stars"
 msgstr "Stars"
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1541
+#: build/trans_presets.java:1542
 msgid "Motel"
 msgstr "Motel"
@@ -13844,20 +14187,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 "Motel Düzenle"
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1547
+#: build/trans_presets.java:1548
 msgid "Guest House"
 msgstr "Misafir Evi"
 
 #. item
-#: build/trans_presets.java:1548
+#: build/trans_presets.java:1549
 msgid "Edit Guest House"
 msgstr "Misafir Evi Düzenle"
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1552
+#: build/trans_presets.java:1553
 msgid "Chalet"
 msgstr "kulübe"
@@ -13865,10 +14208,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 "külübe düzenle"
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1558
+#: build/trans_presets.java:1559
 msgid "Hostel"
 msgstr "Hostel"
@@ -13876,30 +14219,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 "Hostel Düzenle"
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1564
+#: build/trans_presets.java:1565
 msgid "Alpine Hut"
 msgstr "Dağcı Barakası"
 
 #. item
-#: build/trans_presets.java:1565
+#: build/trans_presets.java:1566
 msgid "Edit Alpine Hut"
 msgstr "Dağcı Barakası Düzenle"
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1570
+#: build/trans_presets.java:1571
 msgid "Caravan Site"
 msgstr "Karavan Alanı"
 
 #. item
-#: build/trans_presets.java:1571
+#: build/trans_presets.java:1572
 msgid "Edit Caravan Site"
 msgstr "Karavan Alanı Düzenle"
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1575
+#: build/trans_presets.java:1576
 msgid "Camping Site"
 msgstr "Kamp Sitesi"
@@ -13907,10 +14250,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 "Kamp Sitesi Düzenle"
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1582
+#: build/trans_presets.java:1583
 msgid "Food+Drinks"
 msgstr "Yüyecek+içecek"
@@ -13921,5 +14264,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 "Restaurant"
@@ -13927,5 +14270,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 "Restorant Düzenle"
@@ -13933,5 +14276,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 "lokanta"
@@ -13939,61 +14282,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 "italyan"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "chinese"
 msgstr "çinli"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "burger"
 msgstr "burger"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "greek"
 msgstr "yunan"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "german"
 msgstr "alman"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "indian"
 msgstr "hint"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "regional"
 msgstr "yöresel"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "turkish"
 msgstr "türk"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "asian"
 msgstr "asyalı"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "thai"
 msgstr "thai"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "mexican"
 msgstr "mexican"
 
-#: build/trans_presets.java:1588 build/trans_presets.java:1595
+#: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "japanese"
 msgstr "japanese"
 
-#: build/trans_presets.java:1590
+#: build/trans_presets.java:1591
 msgid "Fast Food"
 msgstr "Fast Food"
@@ -14001,9 +14344,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 "Fast Food düzenle"
 
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1598
 msgid "Cafe"
 msgstr "Kafe"
@@ -14011,10 +14354,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 "Cafe düzenle"
 
 #. item "Food+Drinks/Cafe" text "Name"
-#: build/trans_presets.java:1603
+#: build/trans_presets.java:1604
 msgid "Pub"
 msgstr "Pub"
@@ -14022,20 +14365,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 "Pub Düzenle"
 
 #. item "Food+Drinks/Pub" text "Name"
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1610
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item
-#: build/trans_presets.java:1610
+#: build/trans_presets.java:1611
 msgid "Edit Biergarten"
 msgstr "Biergarten Düzenle"
 
 #. item "Food+Drinks/Biergarten" text "Name"
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1615
 msgid "Bar"
 msgstr ""
@@ -14043,10 +14386,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 "GeceKlubu"
@@ -14054,20 +14397,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 "GeceKulubu Düzenle"
 
 #. item "Food+Drinks/Nightclub" text "Name"
-#: build/trans_presets.java:1627
+#: build/trans_presets.java:1628
 msgid "Tourism"
 msgstr "Turizm"
 
 #. group "Tourism"
-#: build/trans_presets.java:1628
+#: build/trans_presets.java:1629
 msgid "Attraction"
 msgstr "İlginç Yerler"
 
 #. item
-#: build/trans_presets.java:1629
+#: build/trans_presets.java:1630
 msgid "Edit Attraction"
 msgstr "İlginç Yerler Düzenle"
@@ -14076,11 +14419,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 "Açılış saati"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1634
+#: build/trans_presets.java:1635
 msgid "Museum"
 msgstr "Müse"
@@ -14088,10 +14431,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 "Müze Düzenle"
 
 #. item "Tourism/Museum" text "Name"
-#: build/trans_presets.java:1640
+#: build/trans_presets.java:1641
 msgid "Zoo"
 msgstr "Hayvanat Bahçesi"
@@ -14100,10 +14443,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 "Hayvanat Bahçesi Düzenle"
 
 #. item "Tourism/Zoo" text "Name"
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1648
 msgid "Viewpoint"
 msgstr "Seyir Yeri"
@@ -14111,25 +14454,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 "Seyir Yeri Düzenle"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1652
+#: build/trans_presets.java:1653
 msgid "Look-Out Tower"
 msgstr "Seyir Kulesi"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1654
+#: build/trans_presets.java:1655
 msgid "Theme Park"
 msgstr "Lunapark"
 
 #. item
-#: build/trans_presets.java:1655
+#: build/trans_presets.java:1656
 msgid "Edit Theme Park"
 msgstr "Lunapark Düzenle"
 
 #. item "Tourism/Theme Park" text "Name"
-#: build/trans_presets.java:1659
+#: build/trans_presets.java:1660
 msgid "Artwork"
 msgstr "Sanatsal"
@@ -14137,5 +14480,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 "Sanatsal Düzenle"
@@ -14143,5 +14486,5 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1667
 msgid "Information Office"
 msgstr ""
@@ -14149,83 +14492,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 "Harita"
+
 #. 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 "harita"
 
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1679
 msgid "citymap"
 msgstr "şehir haritası"
 
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1679
 msgid "hikingmap"
 msgstr "gezirehberi"
 
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1679
 msgid "bicyclemap"
 msgstr "bisikletharitası"
 
 #. 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 "yiyecek noktası"
 
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1686
 msgid "history"
 msgstr "tarih"
 
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1686
 msgid "nature"
 msgstr "doğa"
 
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1686
 msgid "wildlife"
 msgstr "vahşiyaşam"
 
 #. 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 "Sığınak"
-
-#. item
-#: build/trans_presets.java:1703
+#. item
+#: build/trans_presets.java:1704
 msgid "Edit Shelter"
 msgstr "Sığınak Düzenle"
@@ -14233,25 +14573,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 "Mangal Alanı"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1709
 msgid "Picnic Site"
 msgstr "Piknik Alanı"
 
 #. item
-#: build/trans_presets.java:1709
+#: build/trans_presets.java:1710
 msgid "Edit Picnic Site"
 msgstr "Piknik Alanı Düzenle"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1716
 msgid "Historic Places"
 msgstr "Tarihi Alanlar"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1716
+#: build/trans_presets.java:1717
 msgid "Castle"
 msgstr "Kale"
@@ -14260,20 +14600,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 "Kale Düzenle"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1724
 msgid "Ruins"
 msgstr "Harabe"
 
 #. item
-#: build/trans_presets.java:1724
+#: build/trans_presets.java:1725
 msgid "Edit Ruins"
 msgstr "Harabe Düzenle"
 
 #. item "Historic Places/Ruins" text "Name"
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1729
 msgid "Archaeological Site"
 msgstr "Arkeolojik Site"
@@ -14282,10 +14622,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 "Arkeolojik Site Düzenle"
 
 #. item "Historic Places/Archaeological Site" text "Name"
-#: build/trans_presets.java:1735
+#: build/trans_presets.java:1736
 msgid "Battlefield"
 msgstr "Savaş Alanı"
@@ -14293,5 +14633,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 "Savaş Alanı Düzenle"
@@ -14299,15 +14639,15 @@
 #. item "Historic Places/Battlefield" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1743
 msgid "Monument"
 msgstr "Anıt"
 
 #. item
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1744
 msgid "Edit Monument"
 msgstr "Anıt Düzenle"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1748
 msgid "Memorial"
 msgstr "Abide"
@@ -14315,45 +14655,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 "Abide Düzenle"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1753
+#: build/trans_presets.java:1754
 msgid "Wayside Cross"
 msgstr "Yol Kenar Geçişi"
 
 #. item
-#: build/trans_presets.java:1754
+#: build/trans_presets.java:1755
 msgid "Edit Wayside Cross"
 msgstr "Yol Kenar Geçişi Düzenle"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1758
+#: build/trans_presets.java:1759
 msgid "Wayside Shrine"
 msgstr "Yolkenarı İbadetyeri"
 
 #. item
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1760
 msgid "Edit Wayside Shrine"
 msgstr "Yolkenarı İbadetyeri Düzenle"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1765
 msgid "Leisure"
 msgstr "Dinlenme Alanı"
 
 #. group "Leisure"
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1766
 msgid "Water Park"
 msgstr "Su Parkı"
 
 #. item
-#: build/trans_presets.java:1766
+#: build/trans_presets.java:1767
 msgid "Edit Water Park"
 msgstr "Su Parkı Düzenle"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1770
+#: build/trans_presets.java:1771
 msgid "Playground"
 msgstr "Oyun Sahası"
@@ -14361,15 +14701,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 "Oyun Sahası Düzenle"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1776
+#: build/trans_presets.java:1777
 msgid "Fishing"
 msgstr "Balıkçılık"
 
 #. item
-#: build/trans_presets.java:1777
+#: build/trans_presets.java:1778
 msgid "Edit Fishing"
 msgstr "Balıkçılık Düzenle"
@@ -14377,15 +14717,15 @@
 #. item "Leisure/Fishing" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1783
+#: build/trans_presets.java:1784
 msgid "Sport Facilities"
 msgstr "Spor Aktivite"
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1784
+#: build/trans_presets.java:1785
 msgid "Stadium"
 msgstr "Stadyum"
 
 #. item
-#: build/trans_presets.java:1785
+#: build/trans_presets.java:1786
 msgid "Edit Stadium"
 msgstr "Stadyum Düzenle"
@@ -14399,6 +14739,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 "Spor Seç"
@@ -14774,6 +15114,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
@@ -14806,227 +15146,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 "çoğul"
 
-#: 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 "okçuluk"
 
-#: 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 "atletik"
 
-#: 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 "avustralya_footbol"
 
-#: 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 "basebol"
 
-#: 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 "basketbol"
 
-#: 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 "bowling"
 
-#: 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 "çimen bowling"
 
-#: 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 "kano"
 
-#: 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 "tırmanma"
 
-#: 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 "kriket"
 
-#: 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 "cricket nets"
 
-#: 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 "croquet"
 
-#: 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 "bisiklet"
 
-#: 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 "köpek yarışı"
 
-#: 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 "at binicilik"
 
-#: 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 "futbol"
 
-#: 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 "golf"
 
-#: 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 "jimnastik"
 
-#: 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 "hokey"
 
-#: 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 "at_yarışı"
 
-#: 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 "motor"
 
-#: 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 "pelota"
 
-#: 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 "raket"
 
-#: 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 "rugby"
 
-#: 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 "atıcılık"
 
-#: 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 "kaykay"
 
-#: 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 "paten"
 
-#: 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 "kaymak"
 
-#: 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 "futbol"
 
-#: 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 "yüzmek"
 
-#: 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 "masa_tenisi"
 
-#: 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 "tenis"
 
-#: build/trans_presets.java:1793
+#: build/trans_presets.java:1794
 msgid "Sports Centre"
 msgstr "spor merkezi"
 
 #. item
-#: build/trans_presets.java:1794
+#: build/trans_presets.java:1795
 msgid "Edit Sports Centre"
 msgstr "spor merkezi düzenle"
 
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1803
 msgid "Pitch"
 msgstr "atıcılık"
 
 #. item
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1804
 msgid "Edit Pitch"
 msgstr "atıcılık düzenle"
 
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1812
 msgid "Racetrack"
 msgstr "yarış pisti"
 
 #. item
-#: build/trans_presets.java:1812
+#: build/trans_presets.java:1813
 msgid "Edit Racetrack"
 msgstr "yarış pisti düzenle"
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1821
 msgid "Golf Course"
 msgstr "Golf Alanı"
 
 #. item
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1822
 msgid "Edit Golf Course"
 msgstr "Golf Alanı Düzenle"
 
 #. item "Sport Facilities/Golf Course" text "Name"
-#: build/trans_presets.java:1825
+#: build/trans_presets.java:1826
 msgid "Miniature Golf"
 msgstr "Minyatür Golf"
 
 #. item
-#: build/trans_presets.java:1826
+#: build/trans_presets.java:1827
 msgid "Edit Miniature Golf"
 msgstr "Minyatür Golf Düzenle"
 
 #. item "Sport Facilities/Miniature Golf" text "Name"
-#: build/trans_presets.java:1831
+#: build/trans_presets.java:1832
 msgid "Sport"
 msgstr "Spor"
 
 #. group "Sport"
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1833
 msgid "Multi"
 msgstr "Çoğul"
 
 #. item
-#: build/trans_presets.java:1833
+#: build/trans_presets.java:1834
 msgid "Edit Multi"
 msgstr "Çoğul Düzenle"
@@ -15065,191 +15405,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 "atıcılık"
 
-#: 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 "spor_merkezi"
 
-#: 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 "stadyum"
 
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1839
 msgid "10pin"
 msgstr "10pin"
 
 #. item
-#: build/trans_presets.java:1839
+#: build/trans_presets.java:1840
 msgid "Edit 10pin"
 msgstr "10pin Düzenle"
 
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1845
 msgid "Athletics"
 msgstr "Atletik"
 
 #. item
-#: build/trans_presets.java:1845
+#: build/trans_presets.java:1846
 msgid "Edit Athletics"
 msgstr "Atletik Düzenle"
 
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1851
 msgid "Archery"
 msgstr "okçuluk"
 
 #. item
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:1852
 msgid "Edit Archery"
 msgstr "okçuluk düzenle"
 
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:1857
 msgid "Climbing"
 msgstr "tırmanma"
 
 #. item
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:1858
 msgid "Edit Climbing"
 msgstr "tırmanma düzenle"
 
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1863
 msgid "Canoeing"
 msgstr "Kano"
 
 #. item
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:1864
 msgid "Edit Canoeing"
 msgstr "Kano Düzenle"
 
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:1869
 msgid "Cycling"
 msgstr "Bisiklet"
 
 #. item
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1870
 msgid "Edit Cycling"
 msgstr "Bisiklet Düzenle"
 
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1875
 msgid "Dog Racing"
 msgstr "Köpek Yarışı"
 
 #. item
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1876
 msgid "Edit Dog Racing"
 msgstr "Köpek Yarışı Düzenle"
 
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1881
 msgid "Equestrian"
 msgstr "binicilik"
 
 #. item
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:1882
 msgid "Edit Equestrian"
 msgstr "binicilik düzenle"
 
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1887
 msgid "Horse Racing"
 msgstr "At Yarışı"
 
 #. item
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1888
 msgid "Edit Horse Racing"
 msgstr "At Yarışı Düzenle"
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:1893
 msgid "Gymnastics"
 msgstr "jimnastik"
 
 #. item
-#: build/trans_presets.java:1893
+#: build/trans_presets.java:1894
 msgid "Edit Gymnastics"
 msgstr "jimnastik düzenle"
 
-#: build/trans_presets.java:1898
+#: build/trans_presets.java:1899
 msgid "Motor Sports"
 msgstr "Motor Sporlar"
 
 #. item
-#: build/trans_presets.java:1899
+#: build/trans_presets.java:1900
 msgid "Edit Motor Sports"
 msgstr "Motor Sporları Düzenle"
 
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:1905
 msgid "Skating"
 msgstr "patinaj"
 
 #. item
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:1906
 msgid "Edit Skating"
 msgstr "patinaj düzenle"
 
-#: build/trans_presets.java:1910
+#: build/trans_presets.java:1911
 msgid "Skateboard"
 msgstr "kaykay"
 
 #. item
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:1912
 msgid "Edit Skateboard"
 msgstr "kaykay düzenle"
 
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:1917
 msgid "Swimming"
 msgstr "yüzme"
 
 #. item
-#: build/trans_presets.java:1917
+#: build/trans_presets.java:1918
 msgid "Edit Swimming"
 msgstr "yüzme düzenle"
 
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:1923
 msgid "Skiing"
 msgstr "Kayak"
@@ -15257,56 +15597,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 "Kayak Düzenle"
 
 #. 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 ""
 
 #. 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 ""
 
-#: 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 ""
 
-#: 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 "Atıcılık"
@@ -15314,178 +15654,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 "Atıcılık Düzenle"
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1940
 msgid "Sport (Ball)"
 msgstr "Spor (Topla)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1941
 msgid "Soccer"
 msgstr "Futbol"
 
 #. item
-#: build/trans_presets.java:1941
+#: build/trans_presets.java:1942
 msgid "Edit Soccer"
 msgstr "Futbol Düzenle"
 
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:1947
 msgid "Football"
 msgstr "Amerikan Futbolu"
 
 #. item
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:1948
 msgid "Edit Football"
 msgstr "Amerikan Futbolu Düzenle"
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1953
 msgid "Australian Football"
 msgstr "Avustralyan Futbol"
 
 #. item
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:1954
 msgid "Edit Australian Football"
 msgstr "Avustralyan Futbol Düzenle"
 
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:1959
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:1960
 msgid "Edit Baseball"
 msgstr "Baseball Düzenle"
 
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:1965
 msgid "Basketball"
 msgstr "Basketbol"
 
 #. item
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:1966
 msgid "Edit Basketball"
 msgstr "Basketbol Düzenle"
 
-#: 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 "Golf Düzenle"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1975
 msgid "golf_course"
 msgstr "golf_alanı"
 
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:1977
 msgid "Boule"
 msgstr "Boule"
 
 #. item
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:1978
 msgid "Edit Boule"
 msgstr "Boule Düzenle"
 
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:1983
 msgid "Bowls"
 msgstr "Bowling"
 
 #. item
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1984
 msgid "Edit Bowls"
 msgstr "Bowling Düzenle"
 
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:1989
 msgid "Cricket"
 msgstr "Kricket"
 
 #. item
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:1990
 msgid "Edit Cricket"
 msgstr "Kricket Düzenle"
 
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:1995
 msgid "Cricket Nets"
 msgstr "Cricket Nets"
 
 #. item
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:1996
 msgid "Edit Cricket Nets"
 msgstr "Cricket Nets Düzenle"
 
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:2001
 msgid "Croquet"
 msgstr "Kroke"
 
 #. item
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:2002
 msgid "Edit Croquet"
 msgstr "kroke Düzelt"
 
-#: build/trans_presets.java:2006
+#: build/trans_presets.java:2007
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item
-#: build/trans_presets.java:2007
+#: build/trans_presets.java:2008
 msgid "Edit Hockey"
 msgstr "Hockey Düzenle"
 
-#: build/trans_presets.java:2012
+#: build/trans_presets.java:2013
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2014
 msgid "Edit Pelota"
 msgstr "Pelota Düzenle"
 
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2019
 msgid "Racquet"
 msgstr "Raket"
 
 #. item
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2020
 msgid "Edit Racquet"
 msgstr "Raket Düzenle"
 
-#: build/trans_presets.java:2024
+#: build/trans_presets.java:2025
 msgid "Rugby"
 msgstr "Rugby"
 
 #. item
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2026
 msgid "Edit Rugby"
 msgstr "Rugby Düzenle"
 
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:2031
 msgid "Table Tennis"
 msgstr "Masa Tenisi"
 
 #. item
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2032
 msgid "Edit Table Tennis"
 msgstr "Masa Tenisi Düzenle"
 
-#: 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 "Tennis Düzenle"
 
 #. <separator/>
-#: build/trans_presets.java:2044
+#: build/trans_presets.java:2045
 msgid "Buildings"
 msgstr "Binalar"
 
 #. group "Buildings"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2046
 msgid "Building"
 msgstr "Bina"
@@ -15493,5 +15833,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2049
 msgid "Public Building"
 msgstr "Kamu Binası"
@@ -15499,10 +15839,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 "Kamu Binası Düzenle"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2055
 msgid "Town hall"
 msgstr "belediye binası"
@@ -15510,10 +15850,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 "belediye binası düzenle"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2061
 msgid "Embassy"
 msgstr "Büyükelçilik"
@@ -15521,10 +15861,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 "Büyükelçilik Düzenle"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2066
+#: build/trans_presets.java:2067
 msgid "Courthouse"
 msgstr "adliye sarayı"
@@ -15533,10 +15873,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 "adliye sarayı düzenle"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2074
 msgid "Prison"
 msgstr "Hapishane"
@@ -15545,10 +15885,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 "Hapishane Düzenle"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2080
+#: build/trans_presets.java:2081
 msgid "Police"
 msgstr "Polis"
@@ -15558,10 +15898,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 "Polis Düzenle"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2089
 msgid "Fire Station"
 msgstr "İtfaye İstasyonu"
@@ -15570,10 +15910,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 "İtfaye İstasyonu Düzenle"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2096
 msgid "Post Office"
 msgstr "Postane"
@@ -15581,5 +15921,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 "Postane Düzenle"
@@ -15587,15 +15927,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2103
 msgid "Kindergarten"
 msgstr "Anaokul"
 
 #. item
-#: build/trans_presets.java:2103
+#: build/trans_presets.java:2104
 msgid "Edit Kindergarten"
 msgstr "Anaokul Düzenle"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2108
 msgid "School"
 msgstr "Okul"
@@ -15603,10 +15943,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 "okul düzenle"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2114
 msgid "University"
 msgstr "Universite"
@@ -15614,10 +15954,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 "Universite Düzenle"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2120
 msgid "College"
 msgstr "kolej"
@@ -15625,5 +15965,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 "kolej düzenle"
@@ -15631,5 +15971,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2126
+#: build/trans_presets.java:2127
 msgid "Cinema"
 msgstr "Sinema"
@@ -15638,10 +15978,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 "Sinema Düzenle"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2133
+#: build/trans_presets.java:2134
 msgid "Library"
 msgstr "kütüphane"
@@ -15650,10 +15990,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 "kütüphane düzenle"
 
 #. item "Buildings/Library" text "Name"
-#: build/trans_presets.java:2140
+#: build/trans_presets.java:2141
 msgid "Arts Centre"
 msgstr "sanat merkezi"
@@ -15661,10 +16001,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 "sanat merkezi düzenle"
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2146
+#: build/trans_presets.java:2147
 msgid "Theatre"
 msgstr "Tiyatro"
@@ -15673,10 +16013,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 "Tiyatro Düzenle"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2154
 msgid "Place of Worship"
 msgstr "Tapınak"
@@ -15686,5 +16026,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 "Tapınak Düzenle"
@@ -15693,6 +16033,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 "Din"
@@ -15701,66 +16041,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 "bahai"
 
-#: 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 "hristiyan"
 
-#: 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 "jain"
 
-#: 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 "yahudi"
 
-#: 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 "müslüman"
 
-#: 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 "Zerdüştlük"
 
-#: 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 "mezhep"
@@ -15769,81 +16109,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 "anglikan"
 
-#: 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 "katholik"
 
-#: 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 "protestan"
 
-#: 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 "yahova_şahitleri"
 
-#: 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 "lutheran"
 
-#: 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 "methodist"
 
-#: 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 "mormon"
 
-#: 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 "orthodox"
 
-#: 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 "pentecostal"
 
-#: 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 "presbyterian"
 
-#: 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 "protestant"
 
-#: 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 "quaker"
 
-#: 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 "shia"
 
-#: 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 "sunni"
 
 #. <separator/>
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2165
 msgid "Addresses"
 msgstr "Adres"
@@ -15852,5 +16192,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 "Adres Bilgileri Düzenle"
@@ -15858,5 +16198,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2169
+#: build/trans_presets.java:2170
 msgid "House number"
 msgstr "Ev no:"
@@ -15864,20 +16204,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2172
 msgid "House name"
 msgstr "Ev İsmi"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2174
 msgid "City name"
 msgstr "Şehir Adı"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2174
+#: build/trans_presets.java:2175
 msgid "Post code"
 msgstr "Posta Kodu"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2176
 msgid "Country code"
 msgstr "Ülke Kodu"
@@ -15885,5 +16225,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2179
 msgid "Address Interpolation"
 msgstr "Adres İnterpolasyon"
@@ -15892,5 +16232,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 "Adres İnterpolasyon Düzenle"
@@ -15898,71 +16238,71 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2184
 msgid "Numbering scheme"
 msgstr "Numara şeması"
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2184
 msgid "odd"
 msgstr "tek"
 
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2184
 msgid "even"
 msgstr "çift"
 
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2184
 msgid "all"
 msgstr "hepsi"
 
-#: 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 "İnsan Yapımı"
 
 #. group "Man Made"
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2188
 msgid "Works"
 msgstr "Tesis"
 
 #. item
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2189
 msgid "Edit Works"
 msgstr "Tesis Düzenle"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2193
 msgid "Tower"
 msgstr "Kule"
 
 #. item
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2194
 msgid "Edit Tower"
 msgstr "Kule Düzenle"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2198
 msgid "Water Tower"
 msgstr "Su Kulesi"
 
 #. item
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2199
 msgid "Edit Water Tower"
 msgstr "Su Kulesi Düzenle"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2203
 msgid "Gasometer"
 msgstr "Gazdeposu"
 
 #. item
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2204
 msgid "Edit Gasometer"
 msgstr "Gazdeposu Düzenle"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2207
+#: build/trans_presets.java:2208
 msgid "Lighthouse"
 msgstr "DenizFeneri"
@@ -15970,10 +16310,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 "DenizFeneri Düzenle"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2214
 msgid "Windmill"
 msgstr "Yeldeğerimeni"
@@ -15981,10 +16321,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 "Yeldeğerimeni Düzenle"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2220
 msgid "Pipeline"
 msgstr "Suboru Hattı"
@@ -15992,10 +16332,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 "Suboru hattı Düzenle"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2225
+#: build/trans_presets.java:2226
 msgid "Wastewater Plant"
 msgstr "Kanalizasyon Plant"
@@ -16005,10 +16345,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 "Kanalizasyon Plant Düzenle"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2233
+#: build/trans_presets.java:2234
 msgid "Crane"
 msgstr "Vinç"
@@ -16016,10 +16356,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 "Vinç Düzenle"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2239
+#: build/trans_presets.java:2240
 msgid "Beacon"
 msgstr "Fener"
@@ -16027,10 +16367,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 "Fener Düzenle"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2245
+#: build/trans_presets.java:2246
 msgid "Survey Point"
 msgstr "Poligon Noktası"
@@ -16038,10 +16378,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 "Poligon Noktası Düzenle"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2252
 msgid "Surveillance"
 msgstr "Gözetim"
@@ -16049,5 +16389,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 "Gözetim Kamera Düzenle"
@@ -16055,5 +16395,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2258
+#: build/trans_presets.java:2259
 msgid "Power Generator"
 msgstr "Güç Jeneratorü"
@@ -16063,39 +16403,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 "Güç Jeneratorü Düzenle"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "wind"
 msgstr "rüzgar"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "hydro"
 msgstr "hidro"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "fossil"
 msgstr "fosil"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "nuclear"
 msgstr "nükleer"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "coal"
 msgstr "kömür"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "photovoltaic"
 msgstr "güneş enerjisi"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2265
 msgid "gas"
 msgstr "benzin"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2268
 msgid "Power Station"
 msgstr "Güç İstasyonu"
@@ -16104,10 +16444,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 "Güç İstasyonu Düzenle"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2274
+#: build/trans_presets.java:2275
 msgid "Power Sub Station"
 msgstr "Alt Güç İstasyonu"
@@ -16116,5 +16456,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 "Alt Güç İstasyonu Düzenle"
@@ -16122,10 +16462,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 "çizgi referansı"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2282
+#: build/trans_presets.java:2283
 msgid "Power Tower"
 msgstr "Güç Kulesi"
@@ -16136,5 +16476,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 "güç Kulesi Düzenle"
@@ -16142,5 +16482,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 "Güç Hattı"
@@ -16149,25 +16489,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 "Güç Hattı Düzenle"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2298
 msgid "Voltage"
 msgstr "Voltaj"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2299
 msgid "Amount of Wires"
 msgstr "Kablo Miktarı"
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2301
+#: build/trans_presets.java:2302
 msgid "Amenities"
 msgstr "hoş mekan"
 
 #. group "Amenities"
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2303
 msgid "Toilets"
 msgstr "Tuvalet"
@@ -16175,20 +16515,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 "Referans Numarası"
 
 #. 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 "Not"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2312
 msgid "Post Box"
 msgstr "Posta Kutusu"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2317
 msgid "Telephone"
 msgstr "Telefon"
@@ -16197,5 +16537,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 "Telefon Düzenle"
@@ -16203,5 +16543,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 "Madeni Para"
@@ -16209,5 +16549,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 "Notlar"
@@ -16215,5 +16555,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 "Elektronik cüzdan ve Para Değişim Kartları"
@@ -16221,5 +16561,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 "ATM kartı"
@@ -16227,15 +16567,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 "Kredi Kartı"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2328
 msgid "Telephone cards"
 msgstr "Telefon kart"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2330
 msgid "Recycling"
 msgstr "Geri Dönüşüm"
@@ -16244,5 +16584,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 "Geri Dönüşüm İstasyonu"
@@ -16250,35 +16590,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 "Piller"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2336
 msgid "Cans"
 msgstr "Çöp Tenekesi"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2337
 msgid "Clothes"
 msgstr "Kıyafet"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2338
 msgid "Glass"
 msgstr "Cam"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2339
 msgid "Paper"
 msgstr "Kağıt"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2340
 msgid "Scrap Metal"
 msgstr "Hurda Metal"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2342
 msgid "Bench"
 msgstr "banket"
@@ -16287,20 +16627,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 "Av Standı"
 
 #. item
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2347
 msgid "Edit Hunting Stand"
 msgstr "Av Standı Düzenle"
 
 #. item "Amenities/Hunting Stand" check "Shelter"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2350
 msgid "Hide"
 msgstr "Sakla"
 
 #. item "Amenities/Hunting Stand" check "Hide"
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2351
 msgid "Lock"
 msgstr "Kilitle"
@@ -16308,22 +16648,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 "Yükseklik"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2351
+#: build/trans_presets.java:2352
 msgid "low"
 msgstr "alçak"
 
-#: build/trans_presets.java:2351
+#: build/trans_presets.java:2352
 msgid "half"
 msgstr "yarım"
 
-#: build/trans_presets.java:2351
+#: build/trans_presets.java:2352
 msgid "full"
 msgstr "tam"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2354
 msgid "Fountain"
 msgstr "Kaynak"
@@ -16332,10 +16672,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 "Kaynak Düzenle"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2361
 msgid "Drinking Water"
 msgstr "İçme Suyu"
@@ -16344,10 +16684,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 "İçme Suyu Düzenle"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2367
+#: build/trans_presets.java:2368
 msgid "Baby Hatch"
 msgstr "Bebek Yuvası"
@@ -16355,25 +16695,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 "Bebek Yuvası Düzenle"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2375
+#: build/trans_presets.java:2376
 msgid "Shops"
 msgstr "Dükkanlar"
 
 #. 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 "Supermarket Düzenle"
 
 #. item "Shops/Supermarket" text "Name"
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:2382
 msgid "Convenience Store"
 msgstr "Bakkal"
@@ -16381,10 +16721,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 "Bakkal Düzenle"
 
 #. item "Shops/Convenience Store" text "Name"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2388
 msgid "Kiosk"
 msgstr "Kiosk"
@@ -16392,10 +16732,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 "Kiosk Düzenle"
 
 #. item "Shops/Kiosk" text "Name"
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2394
 msgid "Vending machine"
 msgstr "Kahve Makinası"
@@ -16403,5 +16743,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 "Kahve Makinası Düzenle"
@@ -16409,88 +16749,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 "Ücretli Ürünler"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "public_transport_tickets"
 msgstr "toplu_taşıma_bileti"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "public_transport_plans"
 msgstr "toplu_taşıma_hatları"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "parking_tickets"
 msgstr "Park_bileti"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "food"
 msgstr "yiyecek"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "drinks"
 msgstr "içecek"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "sweets"
 msgstr "tatlı"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "cigarettes"
 msgstr "sigara"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "photos"
 msgstr "fotoğraf"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "animal_food"
 msgstr "hayvan_besini"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "news_papers"
 msgstr "gazeteler"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "toys"
 msgstr "oyuncuklar"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "stamps"
 msgstr "pullar"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "SIM-cards"
 msgstr "SIM-kart"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "telephone_vouchers"
 msgstr "telefon_kartı"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "vouchers"
 msgstr "bilet"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "condoms"
 msgstr "kondom"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "tampons"
 msgstr "tampon"
 
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "excrement_bags"
 msgstr "dışkı_poşeti"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2407
 msgid "Account or loyalty cards"
 msgstr "hesap veya üyelik kartı"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2408
+#: build/trans_presets.java:2409
 msgid "Butcher"
 msgstr "kasap"
@@ -16498,10 +16838,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 "kasap düzenle"
 
 #. item "Shops/Butcher" text "Name"
-#: build/trans_presets.java:2414
+#: build/trans_presets.java:2415
 msgid "Baker"
 msgstr "fırın"
@@ -16509,10 +16849,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 "fırın düzenle"
 
 #. item "Shops/Baker" text "Name"
-#: build/trans_presets.java:2420
+#: build/trans_presets.java:2421
 msgid "Florist"
 msgstr ""
@@ -16520,20 +16860,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 ""
 
 #. 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 ""
@@ -16541,60 +16881,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 ""
 
 #. 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 ""
 
 #. item
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2444
 msgid "Edit Computer Shop"
 msgstr ""
 
 #. item "Shops/Computer" text "Name"
-#: build/trans_presets.java:2447
+#: build/trans_presets.java:2448
 msgid "Electronics"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2448
+#: build/trans_presets.java:2449
 msgid "Edit Electronics Shop"
 msgstr ""
 
 #. 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 ""
 
 #. item
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2459
 msgid "Edit Furniture Shop"
 msgstr ""
 
 #. item "Shops/Furniture" text "Name"
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2463
 msgid "Garden Centre"
 msgstr ""
@@ -16602,10 +16942,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 ""
 
 #. item "Shops/Garden Centre" text "Name"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2469
 msgid "Hardware"
 msgstr ""
@@ -16613,10 +16953,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 ""
 
 #. item "Shops/Hardware" text "Name"
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2475
 msgid "Do-it-yourself-store"
 msgstr "kendin-al-market"
@@ -16624,60 +16964,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 "kendin-al-market düzenle"
 
 #. item "Shops/Do-it-yourself-store" text "Name"
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2481
 msgid "Stationery"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2482
 msgid "Edit Stationery Shop"
 msgstr ""
 
 #. item "Shops/Stationery" text "Name"
-#: build/trans_presets.java:2485
+#: build/trans_presets.java:2486
 msgid "Hairdresser"
 msgstr "berber"
 
 #. item
-#: build/trans_presets.java:2486
+#: build/trans_presets.java:2487
 msgid "Edit Hairdresser"
 msgstr "berber düzenle"
 
 #. item "Shops/Hairdresser" text "Name"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2491
 msgid "Shoes"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2492
 msgid "Edit Shoe Shop"
 msgstr ""
 
 #. item "Shops/Shoes" text "Name"
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2496
 msgid "Toys"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2497
 msgid "Edit Toy Shop"
 msgstr ""
 
 #. item "Shops/Toys" text "Name"
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2501
 msgid "Video"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2502
 msgid "Edit Video Shop"
 msgstr ""
 
 #. item "Shops/Video" text "Name"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2506
 msgid "Dry Cleaning"
 msgstr "Kuru Temizleme"
@@ -16685,10 +17025,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 "Kuru Temizleme Düzenle"
 
 #. item "Shops/Dry Cleaning" text "Name"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2512
 msgid "Laundry"
 msgstr "Çamaşırhane"
@@ -16696,10 +17036,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 "Çamaşırhane Düzenle"
 
 #. item "Shops/Laundry" text "Name"
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2518
 msgid "Outdoor"
 msgstr "Dışortam"
@@ -16707,35 +17047,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 "Dış ortam dükkanları düzenle"
 
 #. item "Shops/Outdoor" text "Name"
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2524
 msgid "Sports"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2525
 msgid "Edit Sports Shop"
 msgstr ""
 
 #. item "Shops/Sports" text "Name"
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2529
 msgid "Optician"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2530
 msgid "Edit Optician"
 msgstr ""
 
 #. item "Shops/Optician" text "Name"
-#: build/trans_presets.java:2535
+#: build/trans_presets.java:2536
 msgid "Cash"
 msgstr "Kasa"
 
 #. group "Cash"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2537
 msgid "Bank"
 msgstr "Banka"
@@ -16743,5 +17083,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 "Banka düzenle"
@@ -16749,10 +17089,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 "ATM"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2544
 msgid "Money Exchange"
 msgstr "Döviz Bürosu"
@@ -16760,5 +17100,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 "Döviz Bürosu Düzenle"
@@ -16766,15 +17106,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 "ATM Düzenle"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2557
 msgid "Health"
 msgstr "Sağlık"
 
 #. group "Health"
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2558
 msgid "Doctors"
 msgstr "Doktor"
@@ -16782,20 +17122,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 "Doktor Düzenle"
 
 #. item "Health/Doctors" text "Name"
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2564
 msgid "Dentist"
 msgstr "Dişçi"
 
 #. item
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2565
 msgid "Edit Dentist"
 msgstr "Dişçi Düzenle"
 
 #. item "Health/Dentist" text "Name"
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2569
 msgid "Pharmacy"
 msgstr "Eczane"
@@ -16803,5 +17143,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 "Eczane Düzenle"
@@ -16809,10 +17149,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 "Dispenser"
 
 #. item "Health/Pharmacy" text "Name"
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2576
 msgid "Hospital"
 msgstr "Hastane"
@@ -16820,10 +17160,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 "Hastane Düzenle"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2582
 msgid "Emergency Access Point"
 msgstr "Acil Durum Noktası"
@@ -16832,5 +17172,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 "Acil Durum Noktası Düzenle"
@@ -16839,20 +17179,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2588
 msgid "Point Number"
 msgstr "Nokta Numarası"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2589
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2591
 msgid "Phone Number"
 msgstr "Telefon Numarası"
 
 #. 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 "(Uluslararası kod kullanın, ör +90-212-67890)"
@@ -16860,5 +17200,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 "Veteriner"
@@ -16867,25 +17207,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 "Veteriner Düzenle"
 
 #. group "Places"
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2605
 msgid "Continent"
 msgstr "Kıta"
 
 #. item
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2606
 msgid "Edit Continent"
 msgstr "Kıta Düzenle"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2611
 msgid "Country"
 msgstr "Ülke"
 
 #. item
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2612
 msgid "Edit Country"
 msgstr "Ülke Düzenle"
@@ -16893,30 +17233,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 "İl"
 
 #. item
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2618
 msgid "Edit State"
 msgstr "İl Düzenle"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2622
+#: build/trans_presets.java:2623
 msgid "Region"
 msgstr "Bölge"
 
 #. item
-#: build/trans_presets.java:2623
+#: build/trans_presets.java:2624
 msgid "Edit Region"
 msgstr "Bölge Düzenle"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2628
+#: build/trans_presets.java:2629
 msgid "County"
 msgstr "vilayet"
 
 #. item
-#: build/trans_presets.java:2629
+#: build/trans_presets.java:2630
 msgid "Edit County"
 msgstr "vilayet Düzenle"
@@ -16924,15 +17264,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2635
+#: build/trans_presets.java:2636
 msgid "City"
 msgstr "Şehir"
 
 #. item
-#: build/trans_presets.java:2636
+#: build/trans_presets.java:2637
 msgid "Edit City"
 msgstr "Şehir Düzenle"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2641
+#: build/trans_presets.java:2642
 msgid "Town"
 msgstr "Mahalle"
@@ -16940,10 +17280,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 "Mahalle Düzenle"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2649
 msgid "Suburb"
 msgstr "Banliyo"
@@ -16951,25 +17291,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 "Banliyo Düzenle"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2656
 msgid "Village"
 msgstr "Köy"
 
 #. item
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2657
 msgid "Edit Village"
 msgstr "Köy Düzenle"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2662
 msgid "Hamlet"
 msgstr "Mezra"
 
 #. item
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2663
 msgid "Edit Hamlet"
 msgstr "Mezra Düzenle"
@@ -16977,5 +17317,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2669
 msgid "Locality"
 msgstr "Semt"
@@ -16983,10 +17323,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 "Semt Düzenle"
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2676
 msgid "Island"
 msgstr "Ada"
@@ -16994,5 +17334,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 "Ada Düzenle"
@@ -17000,5 +17340,5 @@
 #. item "Places/Island" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2683
+#: build/trans_presets.java:2684
 msgid "Cave Entrance"
 msgstr "Mağara Girişi"
@@ -17006,10 +17346,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 "Mağara Girişi Düzenle"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2690
 msgid "Peak"
 msgstr "Zirve"
@@ -17017,10 +17357,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 "Zirve Düzenle"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2697
 msgid "Glacier"
 msgstr "Buzul"
@@ -17028,10 +17368,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 "Buzul Düzenle"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2703
+#: build/trans_presets.java:2704
 msgid "Volcano"
 msgstr "Volkan"
@@ -17039,70 +17379,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 "Volkan Düzenle"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2711
+#: build/trans_presets.java:2712
 msgid "Boundaries"
 msgstr "Belediye Sınırı"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2713
 msgid "National"
 msgstr "Milli"
 
 #. item
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2714
 msgid "Edit National Boundary"
 msgstr "Ülke Sınırı Düzenle"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2718
+#: build/trans_presets.java:2719
 msgid "Administrative"
 msgstr "İdari"
 
 #. item
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2720
 msgid "Edit Administrative Boundary"
 msgstr "İdari Sınırları Düzenle"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2724
+#: build/trans_presets.java:2725
 msgid "Civil"
 msgstr "Sivil"
 
 #. item
-#: build/trans_presets.java:2725
+#: build/trans_presets.java:2726
 msgid "Edit Civil Boundary"
 msgstr "Sivil Sınırları Düzenle"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2730
+#: build/trans_presets.java:2731
 msgid "Political"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:2732
 msgid "Edit Political Boundary"
 msgstr "Politik Sınır Düzenle"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2736
+#: build/trans_presets.java:2737
 msgid "National park"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2737
+#: build/trans_presets.java:2738
 msgid "Edit National Park Boundary"
 msgstr "Milli Park Sınırı Düzenle"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2744
 msgid "Land use"
 msgstr "Arazi Kullanımı"
 
 #. group "Land use"
-#: build/trans_presets.java:2744
+#: build/trans_presets.java:2745
 msgid "Tree"
 msgstr "Ağaç"
@@ -17111,15 +17451,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 "Ağaç Düzenle"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2753
 msgid "Botanical Name"
 msgstr "Botannik İsim"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2755
 msgid "Wood"
 msgstr "Orman"
@@ -17128,5 +17468,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 "Orman Düzenle"
@@ -17134,17 +17474,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 "Kozalaklı Orman"
 
-#: build/trans_presets.java:2760 build/trans_presets.java:2769
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
 msgid "deciduous"
 msgstr "yaprak düken orman"
 
-#: build/trans_presets.java:2760 build/trans_presets.java:2769
+#: build/trans_presets.java:2761 build/trans_presets.java:2770
 msgid "mixed"
 msgstr "karışık"
 
-#: build/trans_presets.java:2762
+#: build/trans_presets.java:2763
 msgid "Forest"
 msgstr "orman"
@@ -17153,14 +17493,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 "orman kullanımı düzenle"
 
-#: build/trans_presets.java:2771
+#: build/trans_presets.java:2772
 msgid "Nature Reserve"
 msgstr "korunacak doğa alanı"
 
 #. item
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2773
 msgid "Edit Nature Reserve"
 msgstr "korunacak doğa alanı düzenle"
@@ -17168,25 +17508,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2777
+#: build/trans_presets.java:2778
 msgid "Scree"
 msgstr "Taşlık Alan"
 
 #. item
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:2779
 msgid "Edit Scree"
 msgstr "Taşlık Alan Düzenle"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2783
 msgid "Scrub"
 msgstr "Çalılık"
 
 #. item
-#: build/trans_presets.java:2783
+#: build/trans_presets.java:2784
 msgid "Edit Scrub"
 msgstr "Çalılık Düzenle"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2788
 msgid "Fell"
 msgstr "Dağ Eteği"
@@ -17194,10 +17534,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 "Dağ Eteği Kullanımı"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2794
 msgid "Heath"
 msgstr "Sağlıksız Ağaç"
@@ -17205,5 +17545,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 "Sağlıksız Ağaç Düzenle"
@@ -17211,5 +17551,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2801
 msgid "Farmyard"
 msgstr "Çiftlik"
@@ -17218,45 +17558,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 "Çiftlik Kullanımı Düzenle"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2808
+#: build/trans_presets.java:2809
 msgid "Farmland"
 msgstr "Çiftlik Arazisi"
 
 #. item
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2810
 msgid "Edit Farmland Landuse"
 msgstr "Çiftlik Arazisi Kullanımı Düzenle"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2814
+#: build/trans_presets.java:2815
 msgid "Meadow"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2816
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2820
+#: build/trans_presets.java:2821
 msgid "Vineyard"
 msgstr "Bağ"
 
 #. item
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2822
 msgid "Edit Vineyard Landuse"
 msgstr "Bağ Kullanımı Düzenle"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2826
+#: build/trans_presets.java:2827
 msgid "Allotments"
 msgstr "Kiralık Tarım Alanı"
 
 #. item
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:2828
 msgid "Edit Allotments Landuse"
 msgstr "Kiralık Tarım Alanı Düzenle"
@@ -17264,25 +17604,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2833
+#: build/trans_presets.java:2834
 msgid "Garden"
 msgstr "Bahçe"
 
 #. item
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2835
 msgid "Edit Garden"
 msgstr "Bahçe Düzenle"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2838
+#: build/trans_presets.java:2839
 msgid "Grass"
 msgstr "Otlak"
 
 #. item
-#: build/trans_presets.java:2839
+#: build/trans_presets.java:2840
 msgid "Edit Grass Landuse"
 msgstr "Otlak Kullanım Düzenle"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2845
 msgid "Village Green"
 msgstr "Köy Yerleşimi"
@@ -17290,10 +17630,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 "Köy Yerleşimi Düzenle"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:2852
 msgid "Common"
 msgstr "Genel"
@@ -17301,20 +17641,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 "Genel Düzenle"
 
 #. 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 "Park Düzenle"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2863
 msgid "Recreation Ground"
 msgstr "oyun alanı"
@@ -17322,5 +17662,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 "oyun alanı kullanımı düzenle"
@@ -17328,15 +17668,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2871
 msgid "Residential area"
 msgstr "Yerleşim Alanı"
 
 #. item
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2872
 msgid "Edit Residential Landuse"
 msgstr "Yerleşim Alanı Kullanımı Düzenle"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2877
 msgid "Graveyard"
 msgstr "Mezarlık"
@@ -17344,9 +17684,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 "Mezarlık Düzenle"
 
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:2885
 msgid "Cemetery"
 msgstr "Mezarlık"
@@ -17354,39 +17694,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 "Mezarlık Kullanımı Düzenle"
 
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2894
 msgid "Retail"
 msgstr "Perakende"
 
 #. item
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2895
 msgid "Edit Retail Landuse"
 msgstr "Perakende Alan Kullanımı Düzenle"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2900
 msgid "Commercial"
 msgstr "Ticari"
 
 #. item
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2901
 msgid "Edit Commercial Landuse"
 msgstr "Ticari Alan Kullanımı Düzenle"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2906
 msgid "Industrial"
 msgstr "Endüstriyel"
 
 #. item
-#: build/trans_presets.java:2906
+#: build/trans_presets.java:2907
 msgid "Edit Industrial Landuse"
 msgstr "Endüstriyel Alan Kullanımı Düzenle"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2912
 msgid "Railway land"
 msgstr "Demiryolu alanı"
@@ -17394,15 +17734,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 "Demiryolu alanı kullanımı düzenle"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:2919
 msgid "Military"
 msgstr "Askeri"
 
 #. item
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2920
 msgid "Edit Military Landuse"
 msgstr "Askeri Alan Düzenle"
@@ -17410,55 +17750,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2925
+#: build/trans_presets.java:2926
 msgid "Construction area"
 msgstr "İnşaat Alanı"
 
 #. item
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2927
 msgid "Edit Construction Landuse"
 msgstr "İnşaat Alanı Düzenle"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2932
 msgid "Brownfield"
 msgstr "Ağaçsız_Alan"
 
 #. item
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:2933
 msgid "Edit Brownfield Landuse"
 msgstr "Ağaçsız_Alan Kullanımı Düzenle"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2937
+#: build/trans_presets.java:2938
 msgid "Greenfield"
 msgstr "Yeşil Alan"
 
 #. item
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:2939
 msgid "Edit Greenfield Landuse"
 msgstr "yeşil Alan kullanımı düzenle"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:2944
 msgid "Landfill"
 msgstr "Toprak Dolum"
 
 #. item
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:2945
 msgid "Edit Landfill Landuse"
 msgstr "Toprak Dolum Alanı Düzenle"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2950
 msgid "Quarry"
 msgstr "Taşocağı"
 
 #. item
-#: build/trans_presets.java:2950
+#: build/trans_presets.java:2951
 msgid "Edit Quarry Landuse"
 msgstr "taşocağı Düzenle"
 
 #. group "Relations"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2960
 msgid "Multipolygon"
 msgstr ""
@@ -17468,5 +17808,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 ""
@@ -17475,10 +17815,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:2970
 msgid "outer segment"
 msgstr ""
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:2970
+#: build/trans_presets.java:2971
 msgid "inner segment"
 msgstr ""
@@ -17486,5 +17826,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:2974
 msgid "Turn restriction"
 msgstr ""
@@ -17493,5 +17833,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 ""
@@ -17499,34 +17839,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 ""
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_straight_on"
 msgstr ""
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "no_u_turn"
 msgstr ""
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "only_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "only_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "only_straight_on"
 msgstr ""
@@ -17535,15 +17875,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2983
+#: build/trans_presets.java:2984
 msgid "from way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2985
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2986
 msgid "to way"
 msgstr ""
@@ -17551,5 +17891,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:2988
+#: build/trans_presets.java:2989
 msgid "Route"
 msgstr ""
@@ -17558,5 +17898,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 ""
@@ -17564,5 +17904,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 ""
@@ -17634,5 +17974,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
@@ -17641,17 +17981,17 @@
 msgstr "bisiklet"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "bus"
 msgstr "otobüs"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "ski"
 msgstr ""
@@ -17704,5 +18044,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
@@ -17711,13 +18051,13 @@
 msgstr "ayak"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "hiking"
 msgstr ""
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2994
 msgid "detour"
 msgstr ""
@@ -17731,10 +18071,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 "metro"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:2997
 msgid "Symbol description"
 msgstr ""
@@ -17742,26 +18082,26 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:2999
+#: build/trans_presets.java:3000
 msgid "Network"
 msgstr ""
 
 #. item "Relations/Route" combo "State"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3002
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3003
 msgid "Color (hex)"
 msgstr ""
@@ -17770,30 +18110,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:3006
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3007
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3008
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3009
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3010
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3011
 msgid "backward halt point"
 msgstr ""
@@ -21908,7 +22248,19 @@
 msgstr ""
 
+#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
+#~ msgstr "Fare veya Ctrl+ok tuşları ile /./  zoom ve pan yapabilirsin."
+
 #~ msgid "Uploading data"
 #~ msgstr "Bilgi yükleniyor"
 
+#~ msgid "Email"
+#~ msgstr "E-Mail"
+
+#~ msgid "Login name (email) to the OSM account."
+#~ msgstr "OSM için Login adı (email) ."
+
+#~ msgid "OSM username (email)"
+#~ msgstr "OSM kullanıcı_adı (e-mail)"
+
 #~ msgid "Unknown host"
 #~ msgstr "Tanımsız host"
@@ -21916,4 +22268,11 @@
 #~ msgid "Add either site-josm.xml or Wiki Pages."
 #~ msgstr "site-josm.xml veya Wiki Pages ekle."
+
+#~ msgid ""
+#~ "Server returned internal error. Try a reduced area or retry after waiting "
+#~ "some time."
+#~ msgstr ""
+#~ "Server bir hata bildirdi. Küçük bir alan deneyiniz veya daha sonra "
+#~ "yapınız."
 
 #~ msgid "Commit comment"
@@ -21970,6 +22329,62 @@
 #~ msgstr "Gerçekten  ''yapılmış'' olarak işaretlemek istiyormusunuz?"
 
+#~ 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 URL.<br><b>Do not use a valuable Password.</b></html>"
+#~ msgstr ""
+#~ "<html>UYARI: şifre konfigürasyon dosyasında düz metin olarak "
+#~ "tutulmaktadır.<br>şifre internet üzerinde aynı şekilde düz metin olarak "
+#~ "gönderilmektedir. <br><b>Değerli bir şifre kullanmayınız.</b></html>"
+
 #~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS"
 #~ msgstr "Metacarta linkinden Rektifiye dosyayı indiriniz"
+
+#~ msgid ""
+#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab "
+#~ "- these will then show up in the WMS menu.\n"
+#~ "\n"
+#~ "You can also do this manually in the Advanced Preferences, using the "
+#~ "following schema:\n"
+#~ "wmsplugin.url.1.name=Landsat\n"
+#~ "wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n"
+#~ "wmsplugin.url.2.name=NPE Maps... etc\n"
+#~ "\n"
+#~ "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"
+#~ "\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"
+#~ "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"
+#~ "Note: Make sure the image is suitable, copyright-wise, if in doubt, don't "
+#~ "use."
+#~ msgstr ""
+#~ "WMS tercihler sekmesinden şu ayarları yapabilirsiniz. Veri ekle, sil, "
+#~ "düzelt gibi - menuler ekranında görünecektir.\n"
+#~ "\n"
+#~ "Aynı zamanda aşağıdaki şemayı kullanarak, ileri tercihler kısmındada "
+#~ "yapabilirsiniz:\n"
+#~ " wmsplugin.url.1.name=Landsat\n"
+#~ "wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n"
+#~ "wmsplugin.url.2.name=NPE Maps... etc\n"
+#~ "\n"
+#~ "Tam WMS link formatı örnek (landsat)\n"
+#~ "http://onearth.jpl.nasa.gov/wms.cgi?"
+#~ "request=GetMap&layers=global_mosaic&styles=&srs=EPSG:4326&format=image/"
+#~ "jpeg\n"
+#~ "\n"
+#~ "Metacarta Map Rectifier için http://labs.metacarta.com/rectifier/ ,  "
+#~ "sadece gerekli 'id' ye ihtiyacınız var.\n"
+#~ "Metacarta Map Rectifier menusunu eklemek için şu linki örnek olarak, 73 ü "
+#~ "sizin 'id' niz ile değiştirin:\n"
+#~ "http://labs.metacarta.com/rectifier/wms.cgi?"
+#~ "id=73&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&\n"
+#~ "format=image/png"
 
 #~ msgid "Portcullis"
@@ -21996,4 +22411,7 @@
 #~ msgstr "viyadük"
 
+#~ msgid "Open the OpenStreetBugs window and activate the automatic download"
+#~ msgstr "OpenStreet Hatalarını Aç ve otomatik indirmeyi etkinleştir"
+
 #~ msgid "Edit Drawbridge"
 #~ msgstr "Asma Köprü düzenle"
Index: applications/editors/josm/i18n/specialmessages.java
===================================================================
--- applications/editors/josm/i18n/specialmessages.java	(revision 16008)
+++ applications/editors/josm/i18n/specialmessages.java	(revision 16009)
@@ -8,3 +8,4 @@
 tr("The maximum bbox size is 0.25, and your request was too large. Either request a smaller area, or use planet.osm"); // OSM server message
 tr("could not get audio input stream from input URL"); // Java message loading audio data
+tr("Audio Device Unavailable"); // Java message loading audio data
 tr("You must make your edits public to upload new data"); // use has not made edits public
